Fix tests for failures due to updated GenericResponse

This was introduced by commit d805646.

Signed-off-by: Bernd Hufmann <[email protected]>

Author: bhufmann

test_tsp.py

@@ -380,13 +380,13 @@ def test_fetch_xy(self, kernel):
 
         response = self.tsp_client.fetch_experiment_outputs(experiment_uuid)
         output_id = response.model.descriptors[0].id
-        status = ResponseStatus.RUNNING.name
-        while status == ResponseStatus.RUNNING.name:
+        status = ResponseStatus.RUNNING
+        while status == ResponseStatus.RUNNING:
             time.sleep(1)
             response = self.tsp_client.fetch_xy_tree(
                 experiment_uuid, output_id)
             assert response.model is not None
-            status = response.model.status.upper()
+            status = response.model.status
 
         params = self.__requested_parameters(response)
         response = self.tsp_client.fetch_xy(experiment_uuid, output_id, params)
@@ -407,13 +407,13 @@ def test_fetch_timegraph_tree_complete(self, kernel):
 
         response = self.tsp_client.fetch_experiment_outputs(experiment_uuid)
         output_id = response.model.descriptors[0].id
-        status = ResponseStatus.RUNNING.name
-        while status == ResponseStatus.RUNNING.name:
+        status = ResponseStatus.RUNNING
+        while status == ResponseStatus.RUNNING:
             time.sleep(1)
             response = self.tsp_client.fetch_timegraph_tree(
                 experiment_uuid, output_id)
             assert response.model is not None
-            status = response.model.status.upper()
+            status = response.model.status
 
         params = self.__requested_parameters(response)
         response = self.tsp_client.fetch_timegraph_tree(
@@ -432,13 +432,13 @@ def test_fetch_virtual_table_columns(self, ust):
         assert response.status_code == 200
         experiment_uuid = response.model.UUID
 
-        status = ResponseStatus.RUNNING.name
-        while status == ResponseStatus.RUNNING.name:
+        status = ResponseStatus.RUNNING
+        while status == ResponseStatus.RUNNING:
             time.sleep(1)
             response = self.tsp_client.fetch_virtual_table_columns(
                 exp_uuid=experiment_uuid, output_id=TABLE_DP_ID)
             assert response.model is not None
-            status = response.model.status.upper()
+            status = response.model.status
 
         output_id = TABLE_DP_ID
         response = self.tsp_client.fetch_virtual_table_columns(exp_uuid=experiment_uuid, output_id=output_id)
@@ -462,13 +462,13 @@ def test_fetch_virtual_table_lines(self, ust):
         assert response.status_code == 200
         experiment_uuid = response.model.UUID
 
-        status = ResponseStatus.RUNNING.name
-        while status == ResponseStatus.RUNNING.name:
+        status = ResponseStatus.RUNNING
+        while status == ResponseStatus.RUNNING:
             time.sleep(1)
             response = self.tsp_client.fetch_virtual_table_columns(
                 exp_uuid=experiment_uuid, output_id=TABLE_DP_ID)
             assert response.model is not None
-            status = response.model.status.upper()
+            status = response.model.status
 
         output_id = TABLE_DP_ID
         response = self.tsp_client.fetch_virtual_table_columns(exp_uuid=experiment_uuid, output_id=output_id)