fix for status in various situations

ICRAR · Aug 23, 2021 · df28e36 · df28e36
1 parent dde980f
commit df28e36
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 32 deletions.
diff --git a/daliuge-engine/.coverage.Andreas-MacBook-Pro.local.58096.791019 b/daliuge-engine/.coverage.Andreas-MacBook-Pro.local.58096.791019
diff --git a/daliuge-engine/.coveragerc b/daliuge-engine/.coveragerc
diff --git a/daliuge-engine/dlg/manager/rest.py b/daliuge-engine/dlg/manager/rest.py
@@ -201,10 +201,13 @@ def getSessions(self):
     @daliuge_aware
     def getSessionInformation(self, sessionId):
         status = self.dm.getSessionStatus(sessionId)
-        if status[list(status.keys())[0]] > 0: # Pristine state sessions don't have a graph, yet.
+        if type(status) is dict:
             graphDict = self.dm.getGraph(sessionId)
-        else:
+        elif type(status) is int:
+            graphDict = self.dm.getGraph(sessionId)
+        elif type(status[list(status.keys())[0]]) is int: # Pristine state sessions don't have a graph, yet.
             graphDict = {}
+            status = 0
         return {'status': status, 'graph': graphDict}
 
     @daliuge_aware

diff --git a/pytest.ini b/pytest.ini
@@ -0,0 +1,7 @@
+# pytest.ini
+[pytest]
+minversion = 6.0
+addopts = -ra -q
+testpaths =
+    daliuge-engine/test
+    daliuge-translator/test