reflect upstream changes in our tests

Signed-off-by: Benjamin Reis <[email protected]>

tests/test_ISOSR.py

@@ -68,17 +68,14 @@ def test_attach_and_detach_local_with_mounted_path(
         isosr.detach(None)
         self.assertFalse(pread.called)
 
-    @testlib.with_context
     @mock.patch('os.path.exists')
     @mock.patch('util.pread')
-    def test_attach_local_with_bad_path(self, context, pread, exists):
-        context.setup_error_codes()
-
+    def test_attach_local_with_bad_path(self, pread, exists):
         # Local path doesn't exist, but error list yes.
         exists.side_effect = [False, True]
 
         isosr = self.create_isosr()
-        with self.assertRaises(SR.SROSError) as ose:
+        with self.assertRaises(xs_errors.SROSError) as ose:
             isosr.attach(None)
         self.assertEqual(ose.exception.errno, 226)
         self.assertFalse(pread.called)

tests/test_ZFSSR.py

@@ -6,6 +6,7 @@
 import os
 import SR
 import ZFSSR
+import xs_errors
 
 
 XML_DEFS = os.path.dirname(os.path.abspath(__file__)) + \
@@ -51,7 +52,7 @@ def test_load_with_zfs_unavailable(self):
         failed = False
         try:
             self.create_zfs_sr()
-        except SR.SROSError as e:
+        except xs_errors.SROSError as e:
             # Check SRUnavailable error.
             failed = e.errno == 47
         self.assertTrue(failed)
@@ -76,7 +77,7 @@ def test_create_with_invalid_zfs_path(
         sr = self.create_zfs_sr()
         try:
             sr.create(sr.uuid, 42)
-        except SR.SROSError as e:
+        except xs_errors.SROSError as e:
             # Check ZFSSRCreate error.
             failed = e.errno == 5000
         self.assertTrue(failed)
@@ -109,7 +110,7 @@ def test_scan_with_invalid_zfs_path(
         sr = self.create_zfs_sr()
         try:
             sr.scan(sr.uuid)
-        except SR.SROSError as e:
+        except xs_errors.SROSError as e:
             # Check SRUnavailable error.
             failed = e.errno == 47
         self.assertTrue(failed)