ut: if _isys is not available dispatch_test and indexed_dict_test are failing.

Fix this as the other tests do: mock _isys.

Part of the patch is fixing trailing whitespace in flags_test.py.

3 files changed, 41 insertions, 31 deletions

diff --git a/tests/pyanaconda_test/dispatch_test.py b/tests/pyanaconda_test/dispatch_test.py
index 61148f5be..c84427ac4 100644
--- a/tests/pyanaconda_test/dispatch_test.py
+++ b/tests/pyanaconda_test/dispatch_test.py
@@ -3,7 +3,7 @@ import mock
 class StepTest(mock.TestCase):
     def setUp(self):
         self.setupModules(
-            ['logging', 'pyanaconda.anaconda_log', 'block'])
+            ['_isys', 'logging', 'pyanaconda.anaconda_log', 'block'])
 
         import pyanaconda
         pyanaconda.anaconda_log = mock.Mock()
@@ -121,7 +121,7 @@ class StepTest(mock.TestCase):
 class DispatchTest(mock.TestCase):
     def setUp(self):
         self.setupModules(
-            ['logging', 'pyanaconda.anaconda_log', 'block'])
+            ['_isys', 'logging', 'pyanaconda.anaconda_log', 'block'])
 
         import pyanaconda
         pyanaconda.anaconda_log = mock.Mock()
diff --git a/tests/pyanaconda_test/flags_test.py b/tests/pyanaconda_test/flags_test.py
index 99d2f1ce7..e4046d56d 100644
--- a/tests/pyanaconda_test/flags_test.py
+++ b/tests/pyanaconda_test/flags_test.py
@@ -8,35 +8,35 @@ import sys
 
 class FlagsTest(mock.TestCase):
     """Simulate /proc/cmdline parameters parsing (#500198)"""
-    
+
     def setUp(self):
         self.setupModules(["_isys", "block", "ConfigParser"])
-        
+
         self.fs = mock.DiskIO()
-        
+
         import pyanaconda.flags
-               
+
         self.mock2 = mock.Mock()
         pyanaconda.flags.open = mock.Mock(return_value=self.mock2)
-    
+
     def tearDown(self):
         self.tearDownModules()
-    
+
     def createcmdlinedict_1_test(self):
         """/proc/cmdline without BOOT_IMAGE param"""
         import pyanaconda.flags
-        
+
         self.cmd = 'vmlinuz initrd=initrd.img stage2=hd:LABEL="Fedora" xdriver=vesa nomodeset'
         self.mock2.read = mock.Mock(return_value=self.cmd)
-        cmddict = pyanaconda.flags.flags.createCmdlineDict()    
+        cmddict = pyanaconda.flags.flags.createCmdlineDict()
 
-        self.assertEqual(set(cmddict.keys()), 
+        self.assertEqual(set(cmddict.keys()),
             set(['vmlinuz', 'initrd', 'stage2', 'xdriver', 'nomodeset']))
 
     def createcmdlinedict_2_test(self):
         """/proc/cmdline param: quotes at end"""
         import pyanaconda.flags
-        
+
         self.cmd = 'vmlinuz BOOT_IMAGE=/boot/img initrd=initrd.img stage2=hd:LABEL="Fedora"'
         self.mock2.read = mock.Mock(return_value=self.cmd)
         try:
@@ -44,35 +44,35 @@ class FlagsTest(mock.TestCase):
         except (ValueError):
             self.assertTrue(False, "ValueError exception was raised.")
 
-        self.assertEqual(set(cmddict.keys()), 
+        self.assertEqual(set(cmddict.keys()),
             set(['vmlinuz', 'BOOT_IMAGE', 'initrd', 'stage2']))
 
     def createcmdlinedict_3_test(self):
         """/proc/cmdline param BOOT_IMAGE with quotes (no quotes at end)"""
         import pyanaconda.flags
-                
+
         self.cmd = 'vmlinuz BOOT_IMAGE="img img" initrd=initrd.img'
         self.mock2.read = mock.Mock(return_value=self.cmd)
-        cmddict = pyanaconda.flags.flags.createCmdlineDict()    
+        cmddict = pyanaconda.flags.flags.createCmdlineDict()
 
-        self.assertEqual(set(cmddict.keys()), 
+        self.assertEqual(set(cmddict.keys()),
             set(['vmlinuz', 'BOOT_IMAGE', 'initrd']))
 
     def createcmdlinedict_4_test(self):
         """/proc/cmdline param BOOT_IMAGE with quotes (no quotes at end) v2"""
         import pyanaconda.flags
-                
+
         self.cmd = 'vmlinuz BOOT_IMAGE="/boot/img" stage2=hd:LABEL="Fedora" initrd=initrd.img'
         self.mock2.read = mock.Mock(return_value=self.cmd)
-        cmddict = pyanaconda.flags.flags.createCmdlineDict()    
+        cmddict = pyanaconda.flags.flags.createCmdlineDict()
 
-        self.assertEqual(set(cmddict.keys()), 
+        self.assertEqual(set(cmddict.keys()),
             set(['vmlinuz', 'BOOT_IMAGE', 'initrd', 'stage2']))
 
     def createcmdlinedict_5_test(self):
         """/proc/cmdline param: BOOT_IMAGE with quotes (+ quotes at end)"""
         import pyanaconda.flags
-                
+
         self.cmd = 'vmlinuz BOOT_IMAGE="/boot/img img" initrd=initrd.img stage2=hd:LABEL="Fedora"'
         self.mock2.read = mock.Mock(return_value=self.cmd)
         try:
@@ -80,9 +80,9 @@ class FlagsTest(mock.TestCase):
         except (ValueError):
             self.assertTrue(False, "ValueError exception was raised.")
 
-        self.assertEqual(set(cmddict.keys()), 
+        self.assertEqual(set(cmddict.keys()),
             set(['vmlinuz', 'BOOT_IMAGE', 'initrd', 'stage2']))
-    
+
     def setattr_getattr_1_test(self):
         import pyanaconda.flags
         RET = 1
@@ -90,7 +90,7 @@ class FlagsTest(mock.TestCase):
         self.mock2.read = mock.Mock(return_value=self.cmd)
         pyanaconda.flags.flags.sshd = RET
         self.assertEqual(RET, pyanaconda.flags.flags.sshd)
-    
+
     def setattr_getattr_2_test(self):
         import pyanaconda.flags
         RET = 0
@@ -98,23 +98,23 @@ class FlagsTest(mock.TestCase):
         self.mock2.read = mock.Mock(return_value=self.cmd)
         pyanaconda.flags.flags.sshd = RET
         self.assertEqual(RET, pyanaconda.flags.flags.sshd)
-    
+
     def setattr_getattr_3_test(self):
         import pyanaconda.flags
         self.cmd = 'vmlinuz initrd=initrd.img xdriver=vesa nomodeset'
         self.mock2.read = mock.Mock(return_value=self.cmd)
-        
+
         def f(): return pyanaconda.flags.flags.fooattr
         self.assertRaises(AttributeError, f)
-    
+
     def setattr_getattr_4_test(self):
         import pyanaconda.flags
         self.cmd = 'vmlinuz initrd=initrd.img xdriver=vesa nomodeset'
         self.mock2.read = mock.Mock(return_value=self.cmd)
-        
+
         def f(): pyanaconda.flags.flags.fooattr = 1
         self.assertRaises(AttributeError, f)
-    
+
     def get_1_test(self):
         import pyanaconda.flags
         RET = 'text'
@@ -122,7 +122,7 @@ class FlagsTest(mock.TestCase):
         self.mock2.read = mock.Mock(return_value=self.cmd)
         ret = pyanaconda.flags.flags.get('foobar', RET)
         self.assertEqual(RET, ret)
-    
+
     def get_2_test(self):
         import pyanaconda.flags
         RET = 'text'
diff --git a/tests/pyanaconda_test/indexed_dict_test.py b/tests/pyanaconda_test/indexed_dict_test.py
index c56a9df78..14185b641 100644
--- a/tests/pyanaconda_test/indexed_dict_test.py
+++ b/tests/pyanaconda_test/indexed_dict_test.py
@@ -1,24 +1,33 @@
 import mock
-from pyanaconda.indexed_dict import IndexedDict
 
 class IndexedDictTest(mock.TestCase):
+    def setUp(self):
+        self.setupModules(['_isys'])
+
+    def tearDown(self):
+        self.tearDownModules()
+
     def instantiation_test(self):
+        from pyanaconda.indexed_dict import IndexedDict
         d = IndexedDict()
         self.assertIsInstance(d, IndexedDict)
 
     def append_test(self):
+        from pyanaconda.indexed_dict import IndexedDict
         d = IndexedDict()
         stored_data = [1, 2, 3]
         d["some_step"] = stored_data
         self.assertIs(d["some_step"], stored_data)
 
     def cant_append_test(self):
+        from pyanaconda.indexed_dict import IndexedDict
         def assign_int(indexed_dict):
             indexed_dict[3] = [1, 2, 3]
         d = IndexedDict()
         self.assertRaises(TypeError, d.__setitem__, 3, [1, 2, 3])
 
     def referencing_test(self):
+        from pyanaconda.indexed_dict import IndexedDict
         d = IndexedDict()
         d["first"] = 10
         d["second"] = 20
@@ -29,6 +38,7 @@ class IndexedDictTest(mock.TestCase):
         self.assertRaises(IndexError, d.__getitem__, 3)
 
     def index_test(self):
+        from pyanaconda.indexed_dict import IndexedDict
         d = IndexedDict()
         d["first"] = 10
         d["second"] = 20
@@ -36,4 +46,4 @@ class IndexedDictTest(mock.TestCase):
 
         self.assertEqual(d.index("first"), 0)
         self.assertEqual(d.index("second"), 1)
-        self.assertEqual(d.index("third"), 2)
\ No newline at end of file
+        self.assertEqual(d.index("third"), 2)