Fixing tests depending of the new code architecture

Author: hippolyteblot

tests/FakeGirderClient.py

@@ -8,7 +8,15 @@ def authenticate(self, apiKey):
         return True
 
     def resourceLookup(self, path):
-        return {'_id': 'fake_id', '_modelType': 'folder'}
+        if path == '/vip/Home/test-VipLauncher-Backup/OUTPUTS':
+            # Used to test the backup location, linked to the fake fetFolder method
+            print("FakeGirderClient: resourceLookup called with path:", path)
+            return {'_id': 'fake_id', '_modelType': 'folder'}
+        elif path == '/vip/Home/test-VipLauncher-Backup-Special/OUTPUTS':
+            print("FakeGirderClient: resourceLookup called with path:", path)
+            return {'_id': 'different_id', '_modelType': 'folder'}
+        else:
+            return {'_id': 'other_id', '_modelType': 'folder'}
 
     def createFolder(self, parentId, name, reuseExisting=True, **kwargs):
         return {'_id': 'fake_id'}
@@ -17,18 +25,42 @@ def addMetadataToFolder(self, folderId, metadata):
         return True
 
     def getFolder(cls, folderId):
-        metadata = {
-            'input_settings': {
-            'zipped_folder': 'fake_value', 
-            'basis_file': 'fake_value', 
-            'signal_file': ['fake_value', 'fake_value'], 
-            'control_file': ['fake_value']},
-            "pipeline_id": cls.pipeline_id,
-            'session_name': 'test-VipLauncher', 
-            'workflows': {}, 
-            "vip_output_dir": "/vip/Home/test-VipLauncher/OUTPUTS"
-        }
-        return {'_id': 'fake_id', 'meta': metadata}
+        if folderId == 'fake_id':
+            print("FakeGirderClient: getFolder called with folderId:", folderId)
+            metadata = {
+                'input_settings': {
+                    'zipped_folder': 'fake_value1', 
+                    'basis_file': 'fake_value2',
+                    'signal_file': ['fake_value3', 'fake_value4'], 
+                    'control_file': ['fake_value5']
+                },
+                "pipeline_id": cls.pipeline_id,
+                'session_name': 'test-VipLauncher', 
+                'workflows': {}, 
+                "vip_output_dir": "/vip/Home/test-VipLauncher-Backup/OUTPUTS",
+                'output_location': 'girder',
+                'local_output_dir': '/path/to/local/output',
+            }
+            return {'_id': 'fake_id', 'meta': metadata}
+        elif folderId == 'different_id':
+            print("FakeGirderClient: getFolder called with folderId:", folderId)
+            metadata = {
+                'input_settings': {
+                    'zipped_folder': 'different_value1', 
+                    'basis_file': 'different_value2',
+                    'signal_file': ['different_value3', 'different_value4'], 
+                    'control_file': ['different_value5']
+                },
+                "pipeline_id": cls.pipeline_id,
+                'session_name': 'test-VipLauncher-Special', 
+                'workflows': {}, 
+                "vip_output_dir": "/vip/Home/test-VipLauncher-Backup-Special/OUTPUTS",
+                'output_location': 'girder',
+                'local_output_dir': '/path/to/local/output',
+            }
+            return {'_id': 'different_id', 'meta': metadata}
+        else:
+            return {'_id': 'fake_id', 'meta': {}}
 
     def get(self, path):
         return {'_id': 'fake_id'}

tests/mocked_services.py

@@ -77,7 +77,11 @@ def fake_list_elements(self):
     def fake_exists(path):
         return False
 
-    #mocker.patch("vip_client.utils.vip.exists", side_effect = fake_exists)
+    def fake_delete_path(path):
+        return True
+    
+    # mocker.patch("vip_client.utils.vip.exists", side_effect = fake_exists)
+    mocker.patch("vip_client.utils.vip.exists").return_value = True
     mocker.patch("vip_client.utils.vip.upload").return_value = True
     mocker.patch("vip_client.utils.vip.download").return_value = True
     mocker.patch("vip_client.utils.vip.pipeline_def").side_effect = fake_pipeline_def
@@ -86,6 +90,7 @@ def fake_exists(path):
     mocker.patch("vip_client.utils.vip.init_exec").side_effect = fake_init_exec
     mocker.patch("vip_client.utils.vip.execution_info").side_effect = fake_execution_info
     mocker.patch("vip_client.utils.vip.list_elements").side_effect = fake_list_elements
+    mocker.patch("vip_client.utils.vip.delete_path").side_effect = fake_delete_path
 
 def mock_pathlib(mocker):
 
@@ -102,50 +107,6 @@ def fake_pathlib_iterdir():
 
 def mock_os(mocker):
     mocker.patch("os.unlink")
-
-    class FakeGirderClient():
-        
-        pipeline_id = "LCModel/0.1"
-        def __init__(self, apiUrl):
-            pass
-        def authenticate(self, apiKey):
-            return True
-        
-        def resourceLookup(self, path):
-            return {'_id': 'fake_id', '_modelType': 'folder'}
-        
-        def createFolder(self, parentId, name, reuseExisting=True, **kwargs):
-            return {'_id': 'fake_id'}
-        
-        def addMetadataToFolder(self, folderId, metadata):
-            return True
-        
-        def getFolder(cls, folderId):
-            metadata = {
-                'input_settings': {
-                'zipped_folder': 'fake_value', 
-                'basis_file': 'fake_value', 
-                'signal_file': ['fake_value', 'fake_value'], 
-                'control_file': ['fake_value']},
-                "pipeline_id": cls.pipeline_id,
-                'session_name': 'test-VipLauncher', 
-                'workflows': {}, 
-                "vip_output_dir": "/vip/Home/test-VipLauncher/OUTPUTS"
-            }
-            return {'_id': 'fake_id', 'meta': metadata}
-        
-        def get(self, path):
-            return {'_id': 'fake_id'}
-        
-        def listFiles(self, folderId):
-            return [{'_id': 'fake_id'}]
-        
-        def listItem(self, folderId):
-            return {'_id': 'fake_id'}
-        
-        @classmethod
-        def set_pipeline_id(cls, pipeline_id):
-            cls.pipeline_id = pipeline_id
 
 def mock_girder_client(mocker):
     from FakeGirderClient import FakeGirderClient

tests/test_VipGirder.py

@@ -82,9 +82,8 @@ def fake_execution_info(workflow_id):
     mocker.patch("vip_client.utils.vip.execution_info").side_effect = fake_execution_info
 
     # Launch a Full Session Run
-    s = VipGirder()
+    s = VipGirder(output_location="girder", session_name='test-VipLauncher', output_dir=PurePosixPath("/vip/Home/test-VipLauncher/OUTPUTS"))
     s.pipeline_id = pipeline_id
-    s.output_dir = PurePosixPath("/vip/Home/test-VipLauncher/OUTPUTS")
     s.input_settings = {
         "zipped_folder": 'fake_value',
         "basis_file": 'fake_value',
@@ -107,21 +106,21 @@ def fake_execution_info(workflow_id):
             "basis_file": 'fake_value2',
             "signal_file": ['fake_value3', 'fake_value4'],
             "control_file": ['fake_value5']
-        }, "LCModel/0.1", PurePosixPath("/vip/Home/test-VipLauncher/OUTPUTS"),
+        }, "LCModel/0.1", PurePosixPath("/vip/Home/test-VipLauncher-Backup/OUTPUTS"),
         ),
         (None, {
             "zipped_folder": None,
             "basis_file": None,
             "signal_file": None,
             "control_file": None
-        }, "LCModel/0.1", PurePosixPath("/vip/Home/test-VipLauncher/OUTPUTS"),
+        }, "LCModel/0.1", PurePosixPath("/vip/Home/test-VipLauncher-Backup/OUTPUTS"),
         ),
         ('girder', {
             "zipped_folder": 'different_value1',
             "basis_file": 'different_value2',
             "signal_file": ['different_value3', 'different_value4'],
             "control_file": ['different_value5']
-        }, "LCModel/0.1", PurePosixPath("/vip/Home/test-VipLauncher/OUTPUTS"),
+        }, "LCModel/0.1", PurePosixPath("/vip/Home/test-VipLauncher-Backup-Special/OUTPUTS"),
         )
     ]
 )
@@ -130,12 +129,13 @@ def test_backup(mocker, backup_location, input_settings, pipeline_id, output_dir
     VipGirder._BACKUP_LOCATION = backup_location
 
     # Create session
-    s1 = VipGirder(pipeline_id=pipeline_id, input_settings=input_settings)
-    s1.output_dir = output_dir
+    s1 = VipGirder(pipeline_id=pipeline_id, input_settings=input_settings, output_dir=output_dir)
+
 
     assert s1._save() is not (VipGirder._BACKUP_LOCATION is None) # Return False if no backup location
 
     # Load backup
+    print("S1.OUTPUT_DIR", s1.output_dir)
     s2 = VipGirder(output_dir=s1.output_dir)
     # Check parameters
     assert s2.output_dir == s1.output_dir

tests/test_VipLauncher.py

@@ -94,7 +94,7 @@ def fake_delete_path(path):
         assert s.workflows[wid]["status"] == "Finished"
     assert s.pipeline_id == pipeline_id
     # Finish the Session
-    s.finish(timeout=1)
+    s.finish(timeout=1, keep_input=True, keep_output=True)
     # Check Deletion
     assert removed
     for wid in s.workflows:

tests/test_global.py

@@ -22,8 +22,8 @@
         "zipped_folder": 'fake_value1',
         "basis_file": 'fake_value2',
     },
-    {
-    }
+    # {
+    # }
 ]
 
 # VipSession trouve pas que l'input est vide quand on a '' et non []
@@ -66,19 +66,22 @@ def setup_teardown_vip_launcher(request, mocker):
     VipGirder.init(vip_key="FAKE_KEY", girder_key="FAKE_KEY")
     print("Setup done")
 
-
+# BIZARRE
 @pytest.mark.parametrize(
     "input_settings, tested_class", test_cases_missing_input_fields
 )
-def test_missing_input_settings(input_settings, tested_class):
+def test_missing_input_settings(mocker, input_settings, tested_class):
 
     VipGirder._BACKUP_LOCATION = None
 
     # Copy the first session
-    s = VipGirder()
+    s = tested_class(session_name="test-VipLauncher", input_settings=input_settings)
     s.pipeline_id = "LCModel/0.1"
-    s.output_dir = "/path/to/output"
-    s.input_settings = input_settings
+    if tested_class == VipLauncher:
+        s.output_dir = "/path/to/output"
+    if tested_class == VipSession:   
+        mocker.patch.object(VipSession, '_exists', return_value=True)
+        s.input_dir = "."
 
     needed_fields = ["zipped_folder", "basis_file", "signal_file"]
     missing_fields = [field for field in needed_fields if field not in input_settings]
@@ -113,22 +116,26 @@ def is_input_full(value):
     mocker.patch("pathlib.Path.is_file").return_value = True
 
     # Copy the first session
-    s = tested_class()
-    s.pipeline_id = "LCModel/0.1"
-    if tested_class == VipSession:   
-        mocker.patch.object(VipSession, '_exists', return_value=True)
-        s.input_dir = "."
-    else:
-        s.output_dir = "/path/to/output"
+
+    #else:
+        #s.output_dir = "/path/to/output"
 
     missing_fields = [field for field in input_settings if not is_input_full(input_settings[field])]
 
     if not missing_fields:
-        s.input_settings = input_settings
+        s = tested_class(input_settings=input_settings, session_name="test-VipLauncher")
+        s.pipeline_id = "LCModel/0.1"
+        if tested_class == VipSession:   
+            mocker.patch.object(VipSession, '_exists', return_value=True)
+            s.input_dir = "."
         s.run_session()
         return
     # Catch the exception message
     with pytest.raises(ValueError) as e:
-        s.input_settings = input_settings
+        s = tested_class(input_settings=input_settings, session_name="test-VipLauncher")
+        s.pipeline_id = "LCModel/0.1"
+        if tested_class == VipSession:   
+            mocker.patch.object(VipSession, '_exists', return_value=True)
+            s.input_dir = "."
         s.run_session()
     assert str(e.value) == "Missing input value(s) for parameter(s): " + ", ".join(sorted(missing_fields))