Extend icontrolsessionfactory to be useful

Author: zancas

conftest.py

@@ -48,6 +48,23 @@ def pytest_addoption(parser):
 
 @pytest.fixture
 def fakeicontrolsession(monkeypatch):
+    class Response(object):
+
+        def json(self):
+            return {'selfLink': 'https://localhost/mgmt/tm/sys?ver=11.6.0'}
+
+    fakesessionclass = mock.create_autospec(iControlRESTSession, spec_set=True)
+    fakesessioninstance = mock.create_autospec(iControlRESTSession('A', 'B'),
+                                               spec_set=True)
+    fakesessioninstance.get =\
+        mock.MagicMock(return_value=Response())
+    fakesessionclass.return_value = fakesessioninstance
+    monkeypatch.setattr('f5.bigip.iControlRESTSession', fakesessionclass)
+
+
+
+@pytest.fixture
+def fakeicontrolsessionfactory(monkeypatch):
     class Response(object):
         def __init__(self, **json_keys):
             if 'selfLink' not in json_keys:
@@ -58,13 +75,17 @@ def __init__(self, **json_keys):
         def json(self):
             return self.params
 
-    fakesessionclass = mock.create_autospec(iControlRESTSession, spec_set=True)
-    fakesessioninstance =\
-        mock.create_autospec(iControlRESTSession('A', 'B'), spec_set=True)
-    fakesessioninstance.get = mock.MagicMock(return_value=Response())
-    fakesessionclass.return_value = fakesessioninstance
-    monkeypatch.setattr('f5.bigip.iControlRESTSession', fakesessionclass)
-
+    def _session_factory(**json_keys):
+        fakesessionclass = mock.create_autospec(iControlRESTSession,
+                                                spec_set=True)
+        fakesessioninstance =\
+            mock.create_autospec(iControlRESTSession('A', 'B'), spec_set=True)
+        fakesessioninstance.get =\
+            mock.MagicMock(return_value=Response(**json_keys))
+        fakesessionclass.return_value = fakesessioninstance
+        monkeypatch.setattr('f5.bigip.iControlRESTSession', fakesessionclass)
+
+    return _session_factory
 
 @pytest.fixture
 def fakeicontrolsession_v12(monkeypatch):

f5/bigip/cm/autodeploy/test/test_software_image_uploads.py

@@ -24,7 +24,8 @@
 CHUNKSIZE = 20
 
 
-def test_software_image_uploads_80a(tmpdir, fakeicontrolsession):
+def test_software_image_uploads_80a(tmpdir, fakeicontrolsessionfactory):
+    fakeicontrolsessionfactory()
     filepath = tmpdir.mkdir('testdir').join('eightya.iso')
     filepath.write(80*'a')
     mr = ManagementRoot('FAKENETLOC', 'FAKENAME', 'FAKEPASSWORD')
@@ -37,7 +38,8 @@ def test_software_image_uploads_80a(tmpdir, fakeicontrolsession):
         assert d == 'a'*CHUNKSIZE
 
 
-def test_software_image_uploads_70a(tmpdir, fakeicontrolsession):
+def test_software_image_uploads_70a(tmpdir, fakeicontrolsessionfactory):
+    fakeicontrolsessionfactory()
     filepath = tmpdir.mkdir('testdir').join('seventya.iso')
     filepath.write(70*'a')
     mr = ManagementRoot('FAKENETLOC', 'FAKENAME', 'FAKEPASSWORD')
@@ -53,7 +55,8 @@ def test_software_image_uploads_70a(tmpdir, fakeicontrolsession):
     assert 10*'a' == lchunk
 
 
-def test_non_ISO_extension(tmpdir, fakeicontrolsession):
+def test_non_ISO_extension(tmpdir, fakeicontrolsessionfactory):
+    fakeicontrolsessionfactory()
     filepath = tmpdir.mkdir('testdir').join('wrong.name')
     mr = ManagementRoot('FAKENETLOC', 'FAKENAME', 'FAKEPASSWORD')
     sius = mr.cm.autodeploy.software_image_uploads