1 files changed, 17 insertions, 3 deletions
diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestMetadata.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestMetadata.py
index 221eb8a3c..a9e9d9701 100644
--- a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestMetadata.py
+++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestMetadata.py
@@ -94,7 +94,13 @@ def get_metadata_object(core=None, watch_clients=False, use_db=False):
         core.setup = MagicMock()
         core.metadata_cache = MagicMock()
     core.setup.cfp.getboolean = Mock(return_value=use_db)
-    return Metadata(core, datastore, watch_clients=watch_clients)
+
+    @patchIf(not isinstance(os.makedirs, Mock), "os.makedirs", Mock())
+    @patchIf(not isinstance(lxml.etree.Element, Mock),
+             "lxml.etree.Element", Mock())
+    def inner():
+        return Metadata(core, datastore, watch_clients=watch_clients)
+    return inner()
 
 
 class TestMetadataDB(DBModelTestCase):
@@ -203,7 +209,11 @@ class TestXMLMetadataConfig(TestXMLFileBacked):
     def get_obj(self, basefile="clients.xml", core=None, watch_clients=False):
         self.metadata = get_metadata_object(core=core,
                                             watch_clients=watch_clients)
-        return XMLMetadataConfig(self.metadata, watch_clients, basefile)
+        @patchIf(not isinstance(lxml.etree.Element, Mock),
+                 "lxml.etree.Element", Mock())
+        def inner():
+            return XMLMetadataConfig(self.metadata, watch_clients, basefile)
+        return inner()
 
     @patch("Bcfg2.Server.FileMonitor.get_fam", Mock())
     def test__init(self):
@@ -1531,7 +1541,11 @@ class TestMetadata_ClientsXML(TestMetadataBase):
             metadata = self.get_obj()
         fam = Bcfg2.Server.FileMonitor._FAM
         Bcfg2.Server.FileMonitor._FAM = MagicMock()
-        metadata.clients_xml = metadata._handle_file("clients.xml")
+        @patchIf(not isinstance(lxml.etree.Element, Mock),
+                 "lxml.etree.Element", Mock())
+        def inner():
+            metadata.clients_xml = metadata._handle_file("clients.xml")
+        inner()
         metadata = TestMetadata.load_clients_data(self, metadata=metadata,
                                                   xdata=xdata)
         rv = TestMetadataBase.load_clients_data(self, metadata=metadata,