diff options
Diffstat (limited to 'testsuite/Testlib/TestServer/TestPlugins')
-rw-r--r-- | testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py | 4 | ||||
-rw-r--r-- | testsuite/Testlib/TestServer/TestPlugins/TestProbes.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py b/testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py index ee39eb2c9..7382a4439 100644 --- a/testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py +++ b/testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py @@ -274,7 +274,7 @@ class TestXMLMetadataConfig(TestXMLFileBacked): @patch('Bcfg2.Server.Plugins.Metadata.locked', Mock(return_value=False)) @patch('fcntl.lockf', Mock()) - @patch('__builtin__.open') + @patch('%s.open' % builtins) @patch('os.unlink') @patch('os.rename') @patch('os.path.islink') @@ -417,7 +417,7 @@ class TestMetadata(_TestMetadata, TestStatistics, TestDatabaseBacked): self.get_obj, core=core, watch_clients=True) @patch('os.makedirs', Mock()) - @patch('__builtin__.open') + @patch('%s.open' % builtins) def test_init_repo(self, mock_open): Metadata.init_repo(datastore, groups_xml="groups", clients_xml="clients") diff --git a/testsuite/Testlib/TestServer/TestPlugins/TestProbes.py b/testsuite/Testlib/TestServer/TestPlugins/TestProbes.py index 3cff4ac73..a779a7707 100644 --- a/testsuite/Testlib/TestServer/TestPlugins/TestProbes.py +++ b/testsuite/Testlib/TestServer/TestPlugins/TestProbes.py @@ -118,7 +118,7 @@ class TestProbeSet(TestEntrySet): ps.HandleEvent(evt) ps.handle_event.assert_called_with(evt) - @patch("__builtin__.list", FakeList) + @patch("%s.list" % builtins, FakeList) def test_get_probe_data(self): ps = self.get_obj() @@ -268,7 +268,7 @@ text probes._write_data_db.assert_called_with("test") self.assertFalse(probes._write_data_xml.called) - @patch("__builtin__.open") + @patch("%s.open" % builtins) def test__write_data_xml(self, mock_open): probes = self.get_probes_object(use_db=False) probes.probedata = self.get_test_probedata() @@ -394,7 +394,7 @@ text probes._load_data_db.assert_any_call() self.assertFalse(probes._load_data_xml.called) - @patch("__builtin__.open") + @patch("%s.open" % builtins) @patch("lxml.etree.parse") def test__load_data_xml(self, mock_parse, mock_open): probes = self.get_probes_object(use_db=False) |