Attachment 878552 Details for Bug 1080221 – patch changing storage to use ext3

[patch] patch changing storage to use ext3

0001-1080221-hwcert-client-1.6.5-storage-tests-still-use-.patch (text/plain), 3.57 KB, created by Greg Nichols on 2014-03-25 16:06:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Nichols

Created: 2014-03-25 16:06:10 UTC

Size: 3.57 KB

patch

obsolete

>From c22708f0e9e59ded09f2bbfc29ced0b1e18d7f46 Mon Sep 17 00:00:00 2001
>From: Greg Nichols <gnichols@redhat.com>
>Date: Tue, 25 Mar 2014 12:04:51 -0400
>Subject: [PATCH] 1080221 - hwcert-client-1.6.5 storage tests still use ext3
> filesystems for benchmark performance
>
>---
> tests/storage/storage.py | 40 +++++++++++++++++++++-------------------
> 1 file changed, 21 insertions(+), 19 deletions(-)
>
>diff --git a/tests/storage/storage.py b/tests/storage/storage.py
>index 214b5bc..be14c9a 100644
>--- a/tests/storage/storage.py
>+++ b/tests/storage/storage.py
>@@ -41,6 +41,7 @@ class StorageTest(Test):
>         self.maxSize = 1048576
>         self.deviceClass = DeviceClass.hard_disk
>         # self.debug = Constants.low
>+        self.fileSystemType = "ext4"
> 
>     def tags(self):
>         return [TestTag.noninteractive, TestTag.certification]
>@@ -339,7 +340,7 @@ class StorageTest(Test):
> 
>     def testVFS(self, storageDevice, testdev, minBs, maxBs):
>         """VFS (buffered filesystem) testing."""
>-        print "*** Testing buffered filesystem (ext3) performance on %s" % testdev
>+        print "*** Testing buffered filesystem (%s) performance on %s" % (self.fileSystemType, testdev)
>         # Create a new filesystem and mount it.
>         oldMountdir = storageDevice + ".XXXXXX"
>         # replace '/' with '-' for cciss devices
>@@ -351,8 +352,8 @@ class StorageTest(Test):
>         else:
>             print "Error: can not make the mount dir."
>             return False
>-        if os.system("mkfs -t ext3 -F /dev/%s" % testdev) == 0:
>-            if os.system("mount -t ext3 /dev/%s %s" % (testdev, mountdir)) == 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:
>                 print "Error: mount %s failed." % testdev
>@@ -520,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 1080221: 878552