Merge pull request #3457 from refinery-platform/ilan-gold/fix_problem…

…atic_python2_code Update Buggy Code in Advance of Python 3 Update
refinery-platform · Oct 10, 2019 · bf46b82 · bf46b82
2 parents 66f92d5 + c8ee5bc
commit bf46b82
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/refinery/analysis_manager/test_tasks.py b/refinery/analysis_manager/test_tasks.py
@@ -111,6 +111,7 @@ def test__check_galaxy_history_state_progress_less_than_percent_complete(
             galaxy_progress_mock
     ):
         self.analysis_status.galaxy_history_progress = 25
+        self.analysis_status.save()
         _check_galaxy_history_state(self.analysis.uuid)
 
         analysis_status = AnalysisStatus.objects.get(analysis=self.analysis)
@@ -128,6 +129,7 @@ def test__check_galaxy_history_state_percent_complete_is_100(
             galaxy_progress_mock
     ):
         self.analysis_status.galaxy_history_progress = 100
+        self.analysis_status.save()
         _check_galaxy_history_state(self.analysis.uuid)
 
         analysis_status = AnalysisStatus.objects.get(analysis=self.analysis)

diff --git a/refinery/tool_manager/views.py b/refinery/tool_manager/views.py
@@ -115,7 +115,9 @@ def create(self, request, *args, **kwargs):
                 with transaction.atomic():
                     tool = create_tool(tool_launch_configuration, request.user)
                     tool.launch()
-                    serializer = ToolSerializer(tool)
+                    serializer = ToolSerializer(
+                        tool, context={'request': request}
+                    )
             except Exception as e:
                 logger.error(e)
                 return HttpResponseBadRequest(e)
@@ -181,7 +183,9 @@ def relaunch(self, request, *args, **kwargs):
                                           "currently running")
         try:
             visualization_tool.launch()
-            serializer = ToolSerializer(visualization_tool)
+            serializer = ToolSerializer(
+                visualization_tool, context={'request': request}
+            )
             return JsonResponse(serializer.data)
         except Exception as e:
             logger.error(e)