[blivet:master 5/5] Adjust detection of exceptions raised.
mulhern
amulhern at redhat.com
Mon Oct 6 13:14:52 UTC 2014
Previously, for MDRaidArrayDevice's, sometimes a DeviceError and sometimes
a RaidError would be thrown if the Raid level was somehow invalid.
Now a DeviceError is thrown, always.
---
tests/devices_test.py | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/tests/devices_test.py b/tests/devices_test.py
index 6ac661d..a2e17ac 100644
--- a/tests/devices_test.py
+++ b/tests/devices_test.py
@@ -8,7 +8,6 @@ from mock import Mock
import blivet
from blivet.errors import DeviceError
-from blivet.errors import RaidError
from blivet.devices import BTRFSSnapShotDevice
from blivet.devices import BTRFSSubVolumeDevice
@@ -467,35 +466,35 @@ class MDRaidArrayDeviceTestCase(DeviceStateTestCase):
spares=lambda x, m: self.assertEqual(x, 1, m),
totalDevices=lambda x, m: self.assertEqual(x, 5, m))
- with self.assertRaisesRegexp(RaidError, "invalid RAID level"):
+ with self.assertRaisesRegexp(DeviceError, "invalid|RAID|level"):
MDRaidArrayDevice("dev")
- with self.assertRaisesRegexp(RaidError, "invalid RAID level"):
+ with self.assertRaisesRegexp(DeviceError, "invalid|RAID|level"):
MDRaidArrayDevice("dev", level="raid2")
- with self.assertRaisesRegexp(RaidError, "invalid RAID level"):
+ with self.assertRaisesRegexp(DeviceError, "invalid|RAID|level"):
MDRaidArrayDevice(
"dev",
parents=[StorageDevice("parent", fmt=getFormat("mdmember"))])
- with self.assertRaisesRegexp(DeviceError, "set requires at least 2 members"):
+ with self.assertRaisesRegexp(DeviceError, "at least 2 members"):
MDRaidArrayDevice(
"dev",
level="raid0",
parents=[StorageDevice("parent", fmt=getFormat("mdmember"))])
- with self.assertRaisesRegexp(RaidError, "invalid RAID level descriptor junk"):
+ with self.assertRaisesRegexp(DeviceError, "invalid|RAID|level"):
MDRaidArrayDevice("dev", level="junk")
- with self.assertRaisesRegexp(ValueError, "memberDevices cannot be greater than totalDevices"):
+ with self.assertRaisesRegexp(DeviceError, "at least 2 members"):
MDRaidArrayDevice("dev", level=0, memberDevices=2)
def testMDRaidArrayDeviceMethods(self):
"""Test for method calls on initialized MDRaidDevices."""
- with self.assertRaisesRegexp(RaidError, "invalid RAID level" ):
+ with self.assertRaisesRegexp(DeviceError, "invalid|RAID|level" ):
self.dev7.level = "junk"
- with self.assertRaisesRegexp(RaidError, "invalid RAID level" ):
+ with self.assertRaisesRegexp(DeviceError, "invalid|RAID|level" ):
self.dev7.level = None
class BTRFSDeviceTestCase(DeviceStateTestCase):
--
1.9.3
More information about the anaconda-patches
mailing list