summaryrefslogtreecommitdiffstats
path: root/testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-08-21 09:08:14 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-08-21 13:33:20 -0400
commitfe716cc6c541239a34d55c0ca5812379a821779a (patch)
treebc183cb1af816cb5fe184a21f99e38f15c200d6f /testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py
parentd0efac8fde1f2bfc77b45899073c225201c64a2c (diff)
downloadbcfg2-fe716cc6c541239a34d55c0ca5812379a821779a.tar.gz
bcfg2-fe716cc6c541239a34d55c0ca5812379a821779a.tar.bz2
bcfg2-fe716cc6c541239a34d55c0ca5812379a821779a.zip
fixed builtin mocks for py3k
Diffstat (limited to 'testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py')
-rw-r--r--testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py4
1 files changed, 2 insertions, 2 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")