commit 52b97e3a35ff82ed4aedeb2bab70cfe68d997ab7
author Julien Pervillé <julien.perville@perfect-memory.com> Thu Nov 26 14:23:43 2020 +0100
committer Julien Pervillé <julien.perville@perfect-memory.com> Thu Nov 26 14:23:43 2020 +0100
tree fe6889424a0597656eb4fa5156cf68241f3158f2
parent c2f623634fd26d940ab54ce4af9e3bdbb77a242a

Fix running 'python run_tests.py' without mock installed systemwide

reclass/values/tests/test_item.py

diff --git a/reclass/values/tests/test_item.py b/reclass/values/tests/test_item.py
index 4b91f6e..e2565ef 100644
--- a/reclass/values/tests/test_item.py
+++ b/reclass/values/tests/test_item.py
@@ -8,7 +8,10 @@
 from reclass.values.item import ContainerItem
 from reclass.values.item import ItemWithReferences
 import unittest
-from mock import MagicMock
+try:
+    import unittest.mock as mock
+except ImportError:
+    import mock
 
 SETTINGS = Settings()
 
@@ -16,7 +19,7 @@
 class TestItemWithReferences(unittest.TestCase):
 
     def test_assembleRef_allrefs(self):
-        phonyitem = MagicMock()
+        phonyitem = mock.MagicMock()
         phonyitem.has_references = True
         phonyitem.get_references = lambda *x: [1]
 
@@ -26,7 +29,7 @@
         self.assertTrue(iwr.allRefs)
 
     def test_assembleRef_partial(self):
-        phonyitem = MagicMock()
+        phonyitem = mock.MagicMock()
         phonyitem.has_references = True
         phonyitem.allRefs = False
         phonyitem.get_references = lambda *x: [1]

reclass/values/tests/test_refitem.py

diff --git a/reclass/values/tests/test_refitem.py b/reclass/values/tests/test_refitem.py
index 6581478..09887ba 100644
--- a/reclass/values/tests/test_refitem.py
+++ b/reclass/values/tests/test_refitem.py
@@ -9,14 +9,17 @@
 from reclass.values.dictitem import DictItem
 from reclass.values.refitem import RefItem
 import unittest
-from mock import MagicMock
+try:
+    import unittest.mock as mock
+except ImportError:
+    import mock
 
 SETTINGS = Settings()
 
 class TestRefItem(unittest.TestCase):
 
     def test_assembleRefs_ok(self):
-        phonyitem = MagicMock()
+        phonyitem = mock.MagicMock()
         phonyitem.render = lambda x, k: 'bar'
         phonyitem.has_references = True
         phonyitem.get_references = lambda *x: ['foo']
@@ -27,7 +30,7 @@
         self.assertTrue(iwr.allRefs)
 
     def test_assembleRefs_failedrefs(self):
-        phonyitem = MagicMock()
+        phonyitem = mock.MagicMock()
         phonyitem.render.side_effect = errors.ResolveError('foo')
         phonyitem.has_references = True
         phonyitem.get_references = lambda *x: ['foo']