summaryrefslogtreecommitdiffstats
path: root/testsuite/Testlib/TestServer/TestPlugins/TestProbes.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/TestProbes.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/TestProbes.py')
-rw-r--r--testsuite/Testlib/TestServer/TestPlugins/TestProbes.py6
1 files changed, 3 insertions, 3 deletions
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)