testsuite: fixed unit tests

2 files changed, 15 insertions, 17 deletions

diff --git a/src/lib/Bcfg2/Encryption.py b/src/lib/Bcfg2/Encryption.py
index 2b4ba6237..b4674d72f 100755
--- a/src/lib/Bcfg2/Encryption.py
+++ b/src/lib/Bcfg2/Encryption.py
@@ -27,7 +27,7 @@ ALGORITHM = "aes_256_cbc"
 #: Default initialization vector.  For best security, you should use a
 #: unique IV for each message.  :func:`ssl_encrypt` does this in an
 #: automated fashion.
-IV = '\0' * 16
+IV = r'\0' * 16
 
 #: The config file section encryption options and passphrases are
 #: stored in
@@ -116,9 +116,11 @@ def ssl_decrypt(data, passwd, algorithm=ALGORITHM):
     # base64-decode the data
     data = b64decode(data)
     salt = data[8:16]
+    # pylint: disable=E1101
     hashes = [md5(passwd + salt).digest()]
     for i in range(1, 3):
         hashes.append(md5(hashes[i - 1] + passwd + salt).digest())
+    # pylint: enable=E1101
     key = hashes[0] + hashes[1]
     iv = hashes[2]
 
@@ -144,9 +146,11 @@ def ssl_encrypt(plaintext, passwd, algorithm=ALGORITHM, salt=None):
     if salt is None:
         salt = Rand.rand_bytes(8)
 
+    # pylint: disable=E1101
     hashes = [md5(passwd + salt).digest()]
     for i in range(1, 3):
         hashes.append(md5(hashes[i - 1] + passwd + salt).digest())
+    # pylint: enable=E1101
     key = hashes[0] + hashes[1]
     iv = hashes[2]
 
diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py
index 58e61e13b..94866cf39 100644
--- a/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py
+++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py
@@ -410,11 +410,12 @@ class TestXMLFileBacked(TestFileBacked):
     should_monitor = None
     path = os.path.join(datastore, "test", "test1.xml")
 
-    @patch("os.makedirs", Mock())
     def get_obj(self, path=None, fam=None, should_monitor=False):
         if path is None:
             path = self.path
-        @patchIf(not isinstance(os.makedirs, Mock), "os.makedirs", Mock())
+
+        @patchIf(not isinstance(os.path.exists, Mock),
+                 "os.path.exists", Mock())
         def inner():
             return self.test_obj(path, fam=fam, should_monitor=should_monitor)
         return inner()
@@ -422,20 +423,16 @@ class TestXMLFileBacked(TestFileBacked):
     def test__init(self):
         fam = Mock()
         xfb = self.get_obj()
-        if self.should_monitor is True:
+        if self.should_monitor:
             self.assertIsNotNone(xfb.fam)
+            fam.reset_mock()
+            xfb = self.get_obj(fam=fam, should_monitor=True)
+            fam.AddMonitor.assert_called_with(self.path, xfb)
         else:
             self.assertIsNone(xfb.fam)
-
-        if self.should_monitor is not True:
             xfb = self.get_obj(fam=fam)
             self.assertFalse(fam.AddMonitor.called)
 
-        if self.should_monitor is not False:
-            fam.reset_mock()
-            xfb = self.get_obj(fam=fam, should_monitor=True)
-            fam.AddMonitor.assert_called_with(self.path, xfb)
-
     @patch("glob.glob")
     @patch("lxml.etree.parse")
     def test_follow_xincludes(self, mock_parse, mock_glob):
@@ -623,7 +620,7 @@ class TestXMLFileBacked(TestFileBacked):
     def test_add_monitor(self):
         xfb = self.get_obj()
         xfb.add_monitor("/test/test2.xml")
-        self.assertIn("/test/test2.xml", xfb.extras)
+        self.assertIn("/test/test2.xml", xfb.extra_monitors)
 
         fam = Mock()
         if self.should_monitor is not True:
@@ -632,14 +629,14 @@ class TestXMLFileBacked(TestFileBacked):
             fam.reset_mock()
             xfb.add_monitor("/test/test3.xml")
             self.assertFalse(fam.AddMonitor.called)
-            self.assertIn("/test/test3.xml", xfb.extras)
+            self.assertIn("/test/test3.xml", xfb.extra_monitors)
 
         if self.should_monitor is not False:
             fam.reset_mock()
             xfb = self.get_obj(fam=fam, should_monitor=True)
             xfb.add_monitor("/test/test4.xml")
             fam.AddMonitor.assert_called_with("/test/test4.xml", xfb)
-            self.assertIn("/test/test4.xml", xfb.extras)
+            self.assertIn("/test/test4.xml", xfb.extra_monitors)
 
 
 class TestStructFile(TestXMLFileBacked):
@@ -2036,6 +2033,3 @@ class TestGroupSpool(TestPlugin, TestGenerator):
         gs.event_id.assert_called_with(event)
         self.assertNotIn("/baz/quux", gs.entries)
         self.assertNotIn("/baz/quux", gs.Entries[gs.entry_type])
-
-
-