fixed unit tests

1 files changed, 39 insertions, 32 deletions

diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestMetadata.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestMetadata.py
index b1db34462..0afa5220d 100644
--- a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestMetadata.py
+++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestMetadata.py
@@ -6,7 +6,6 @@ import socket
 import lxml.etree
 import Bcfg2.Server
 import Bcfg2.Server.Plugin
-from Bcfg2.Server.FileMonitor import _FAM
 from Bcfg2.Server.Plugins.Metadata import *
 from mock import Mock, MagicMock, patch
 
@@ -205,9 +204,10 @@ class TestXMLMetadataConfig(TestXMLFileBacked):
                                             watch_clients=watch_clients)
         return XMLMetadataConfig(self.metadata, watch_clients, basefile)
 
+    @patch("Bcfg2.Server.FileMonitor.get_fam", Mock())
     def test__init(self):
         xmc = self.get_obj()
-        self.assertFalse(_FAM.AddMonitor.called)
+        self.assertFalse(xmc.fam.AddMonitor.called)
 
     def test_xdata(self):
         config = self.get_obj()
@@ -251,20 +251,21 @@ class TestXMLMetadataConfig(TestXMLFileBacked):
         self.assertEqual(config.base_xdata, "<test/>")
 
     def test_add_monitor(self):
-        core = MagicMock()
-        config = self.get_obj(core=core)
+        config = self.get_obj()
+        config.fam = Mock()
 
         fname = "test.xml"
         fpath = os.path.join(self.metadata.data, fname)
 
         config.extras = []
         config.add_monitor(fpath)
-        self.assertFalse(_FAM.AddMonitor.called)
+        self.assertFalse(config.fam.AddMonitor.called)
         self.assertEqual(config.extras, [fpath])
 
-        config = self.get_obj(core=core, watch_clients=True)
+        config = self.get_obj(watch_clients=True)
+        config.fam = Mock()
         config.add_monitor(fpath)
-        _FAM.AddMonitor.assert_called_with(fpath, config.metadata)
+        config.fam.AddMonitor.assert_called_with(fpath, config.metadata)
         self.assertItemsEqual(config.extras, [fpath])
 
     def test_Index(self):
@@ -488,7 +489,8 @@ class TestMetadata(_TestMetadata, TestStatistics, TestDatabaseBacked):
             client_name = "%s%s" % (prefix, i)
         return client_name
 
-    def test__init(self):
+    @patch("Bcfg2.Server.FileMonitor.get_fam")
+    def test__init(self, mock_get_fam):
         # test with watch_clients=False
         core = MagicMock()
         metadata = self.get_obj(core=core)
@@ -501,22 +503,21 @@ class TestMetadata(_TestMetadata, TestStatistics, TestDatabaseBacked):
         self.assertEqual(metadata.states, dict())
 
         # test with watch_clients=True
-        fam = Bcfg2.Server.FileMonitor._FAM
-        Bcfg2.Server.FileMonitor._FAM = MagicMock()
         metadata = self.get_obj(core=core, watch_clients=True)
         self.assertEqual(len(metadata.states), 2)
-        Bcfg2.Server.FileMonitor._FAM.AddMonitor.assert_any_call(os.path.join(metadata.data,
-                                                                              "groups.xml"),
-                                                                 metadata)
-        Bcfg2.Server.FileMonitor._FAM.AddMonitor.assert_any_call(os.path.join(metadata.data,
-                                                                              "clients.xml"),
-                                                                 metadata)
-
-        Bcfg2.Server.FileMonitor._FAM.reset_mock()
-        Bcfg2.Server.FileMonitor._FAM.AddMonitor = Mock(side_effect=IOError)
+        mock_get_fam.return_value.AddMonitor.assert_any_call(
+            os.path.join(metadata.data, "groups.xml"),
+            metadata)
+        mock_get_fam.return_value.AddMonitor.assert_any_call(
+            os.path.join(metadata.data, "clients.xml"),
+            metadata)
+
+        mock_get_fam.reset_mock()
+        fam = Mock()
+        fam.AddMonitor = Mock(side_effect=IOError)
+        mock_get_fam.return_value = fam
         self.assertRaises(Bcfg2.Server.Plugin.PluginInitError,
                           self.get_obj, core=core, watch_clients=True)
-        Bcfg2.Server.FileMonitor._FAM = fam
 
     @patch('os.makedirs', Mock())
     @patch('%s.open' % builtins)
@@ -577,6 +578,7 @@ class TestMetadata(_TestMetadata, TestStatistics, TestDatabaseBacked):
     def test_add_group(self):
         metadata = self.get_obj()
         metadata.groups_xml.write = Mock()
+        metadata.groups_xml.load_xml = Mock()
         metadata.groups_xml.data = lxml.etree.XML('<Groups/>').getroottree()
         metadata.groups_xml.basedata = copy.copy(metadata.groups_xml.data)
 
@@ -609,6 +611,7 @@ class TestMetadata(_TestMetadata, TestStatistics, TestDatabaseBacked):
     def test_update_group(self):
         metadata = self.get_obj()
         metadata.groups_xml.write_xml = Mock()
+        metadata.groups_xml.load_xml = Mock()
         metadata.groups_xml.data = copy.deepcopy(get_groups_test_tree())
         metadata.groups_xml.basedata = copy.copy(metadata.groups_xml.data)
 
@@ -626,6 +629,7 @@ class TestMetadata(_TestMetadata, TestStatistics, TestDatabaseBacked):
     def test_remove_group(self):
         metadata = self.get_obj()
         metadata.groups_xml.write_xml = Mock()
+        metadata.groups_xml.load_xml = Mock()
         metadata.groups_xml.data = copy.deepcopy(get_groups_test_tree())
         metadata.groups_xml.basedata = copy.copy(metadata.groups_xml.data)
 
@@ -641,6 +645,7 @@ class TestMetadata(_TestMetadata, TestStatistics, TestDatabaseBacked):
     def test_add_bundle(self):
         metadata = self.get_obj()
         metadata.groups_xml.write = Mock()
+        metadata.groups_xml.load_xml = Mock()
         metadata.groups_xml.data = lxml.etree.XML('<Groups/>').getroottree()
         metadata.groups_xml.basedata = copy.copy(metadata.groups_xml.data)
 
@@ -664,6 +669,7 @@ class TestMetadata(_TestMetadata, TestStatistics, TestDatabaseBacked):
     def test_remove_bundle(self):
         metadata = self.get_obj()
         metadata.groups_xml.write_xml = Mock()
+        metadata.groups_xml.load_xml = Mock()
         metadata.groups_xml.data = copy.deepcopy(get_groups_test_tree())
         metadata.groups_xml.basedata = copy.copy(metadata.groups_xml.data)
 
@@ -679,6 +685,7 @@ class TestMetadata(_TestMetadata, TestStatistics, TestDatabaseBacked):
     def test_add_client(self):
         metadata = self.get_obj()
         metadata.clients_xml.write = Mock()
+        metadata.clients_xml.load_xml = Mock()
         metadata.clients_xml.data = lxml.etree.XML('<Clients/>').getroottree()
         metadata.clients_xml.basedata = copy.copy(metadata.clients_xml.data)
 
@@ -713,6 +720,7 @@ class TestMetadata(_TestMetadata, TestStatistics, TestDatabaseBacked):
     def test_update_client(self):
         metadata = self.get_obj()
         metadata.clients_xml.write_xml = Mock()
+        metadata.clients_xml.load_xml = Mock()
         metadata.clients_xml.data = copy.deepcopy(get_clients_test_tree())
         metadata.clients_xml.basedata = copy.copy(metadata.clients_xml.data)
 
@@ -1261,25 +1269,24 @@ class TestMetadataBase(TestMetadata):
         return client_name
 
     @patch('os.path.exists')
-    def test__init(self, mock_exists):
-        fam = Bcfg2.Server.FileMonitor._FAM
-        Bcfg2.Server.FileMonitor._FAM = MagicMock()
+    @patch('Bcfg2.Server.FileMonitor.get_fam')
+    def test__init(self, mock_get_fam, mock_exists):
         mock_exists.return_value = False
         metadata = self.get_obj(watch_clients=True)
         self.assertIsInstance(metadata, Bcfg2.Server.Plugin.DatabaseBacked)
-        Bcfg2.Server.FileMonitor._FAM.AddMonitor.assert_called_once_with(
+        mock_get_fam.return_value.AddMonitor.assert_called_with(
             os.path.join(metadata.data, "groups.xml"),
             metadata)
 
         mock_exists.return_value = True
-        Bcfg2.Server.FileMonitor._FAM.reset_mock()
-        metadata = self.get_obj(core=core, watch_clients=True)
-        core.fam.AddMonitor.assert_any_call(os.path.join(metadata.data,
-                                                         "groups.xml"),
-                                            metadata)
-        core.fam.AddMonitor.assert_any_call(os.path.join(metadata.data,
-                                                         "clients.xml"),
-                                            metadata)
+        mock_get_fam.reset_mock()
+        metadata = self.get_obj(watch_clients=True)
+        mock_get_fam.return_value.AddMonitor.assert_any_call(
+            os.path.join(metadata.data, "groups.xml"),
+            metadata)
+        mock_get_fam.return_value.AddMonitor.assert_any_call(
+            os.path.join(metadata.data, "clients.xml"),
+            metadata)
 
     def test_add_group(self):
         pass