Attachment 880943 Details for Bug 1050982 – additional patch changing mkfs from -F to -f

[patch] additional patch changing mkfs from -F to -f

0001-1050982-hwcert-client-1.7.0-62.1-storage-tests-still.patch (text/plain), 2.68 KB, created by Greg Nichols on 2014-03-31 17:24:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Nichols

Created: 2014-03-31 17:24:49 UTC

Size: 2.68 KB

patch

obsolete

>From fea1d9fb864c7ff7124873f1e92d12c515f52f2c Mon Sep 17 00:00:00 2001
>From: Greg Nichols <gnichols@redhat.com>
>Date: Mon, 31 Mar 2014 12:57:30 -0400
>Subject: [PATCH] 1050982 - hwcert-client-1.7.0-62.1 storage tests still use
> ext3 filesystems for benchmark performance
>
>---
> tests/storage/storage.py | 35 ++++++++++++++++++-----------------
> 1 file changed, 18 insertions(+), 17 deletions(-)
>
>diff --git a/tests/storage/storage.py b/tests/storage/storage.py
>index 6036c96..ddaec72 100644
>--- a/tests/storage/storage.py
>+++ b/tests/storage/storage.py
>@@ -352,7 +352,7 @@ class StorageTest(Test):
>         else:
>             print "Error: can not make the mount dir."
>             return False
>-        if os.system("mkfs -t %s -F /dev/%s" % (self.fileSystemType, testdev)) == 0:
>+        if os.system("mkfs -t %s -f /dev/%s" % (self.fileSystemType, testdev)) == 0:
>             if os.system("mount -t %s /dev/%s %s" % (self.fileSystemType, testdev, mountdir)) == 0:
>                 print "mount %s ok." % testdev
>             else:
>@@ -521,23 +521,24 @@ class StorageTest(Test):
>         if size_tmp:
>             minBs = size_tmp
>         # start to torture the disks
>-        success = self.testVFS(self.storageDevice,testdev,minBs,maxBs)
>-        if success:
>-            print "VFS (buffered filesystem) testing passed.\n"
>-        if not self.testRawIO(self.storageDevice,testdev,minBs,maxBs):
>-            success = False
>-        else:
>-            print "Raw I/O testing passed.\n"
>- 
>-        # Clean up, try to restore swap if needed.
>-        if testdev == swapdev:
>-            if self.restoreSwap(swapdev, swapLabel):
>-                print "restored the swap device."
>-            else:
>-                print "Error: restore swap error !"
>+        try:
>+            success = self.testVFS(self.storageDevice,testdev,minBs,maxBs)
>+            if success:
>+                print "VFS (buffered filesystem) testing passed.\n"
>+            if not self.testRawIO(self.storageDevice,testdev,minBs,maxBs):
>                 success = False
>-        # try to remove temp directories
>-        os.system("rmdir %s.* 2>/dev/null" % self.storageDevice)
>+            else:
>+                print "Raw I/O testing passed.\n"
>+        finally:
>+            # Clean up, try to restore swap if needed.
>+            if testdev == swapdev:
>+                if self.restoreSwap(swapdev, swapLabel):
>+                    print "restored the swap device."
>+                else:
>+                    print "Error: restore swap error !"
>+                    success = False
>+            # try to remove temp directories
>+            os.system("rmdir %s.* 2>/dev/null" % self.storageDevice)
> 
>         if success:
>             result = "passed"
>-- 
>1.8.5.3
>

Actions: View | Diff

Attachments on bug 1050982: 878593 | 880943