From 740fc8594edf6e15fdecdc3d1f30be259dc7dea2 Mon Sep 17 00:00:00 2001 From: Bjoern Gruening Date: Tue, 12 Feb 2019 22:22:43 +0100 Subject: [PATCH 1/2] improve test error message --- lib/galaxy/tools/verify/interactor.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/galaxy/tools/verify/interactor.py b/lib/galaxy/tools/verify/interactor.py index 08f67ec690f..01e920e99b7 100644 --- a/lib/galaxy/tools/verify/interactor.py +++ b/lib/galaxy/tools/verify/interactor.py @@ -273,7 +273,7 @@ class GalaxyInteractorApi(object): def test_data_download(self, tool_id, filename, mode='file'): if self.supports_test_data_download: response = self._get("tools/%s/test_data_download?filename=%s" % (tool_id, filename), admin=True) - assert response.status_code == 200 + assert response.status_code == 200, "Test file (%s) is missing. Try --update_test_data to generate one." % filename if mode == 'file': return response.content elif mode == 'directory': @@ -285,7 +285,7 @@ class GalaxyInteractorApi(object): else: # We can only use local data response = self._get("tools/%s/test_data_path?filename=%s" % (tool_id, filename), admin=True) - assert response.status_code == 200 + assert response.status_code == 200, "Test file (%s) is missing. Try --update_test_data to generate one." % filename file_name = response.json() if mode == 'file': return open(file_name, mode='rb') From f311ebd1e2c237f7dc5b10f67f20aea28921877c Mon Sep 17 00:00:00 2001 From: Bjoern Gruening Date: Tue, 12 Feb 2019 22:28:32 +0100 Subject: [PATCH 2/2] mention planemo explicitly --- lib/galaxy/tools/verify/interactor.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/galaxy/tools/verify/interactor.py b/lib/galaxy/tools/verify/interactor.py index 01e920e99b7..068104cacec 100644 --- a/lib/galaxy/tools/verify/interactor.py +++ b/lib/galaxy/tools/verify/interactor.py @@ -273,7 +273,7 @@ class GalaxyInteractorApi(object): def test_data_download(self, tool_id, filename, mode='file'): if self.supports_test_data_download: response = self._get("tools/%s/test_data_download?filename=%s" % (tool_id, filename), admin=True) - assert response.status_code == 200, "Test file (%s) is missing. Try --update_test_data to generate one." % filename + assert response.status_code == 200, "Test file (%s) is missing. If you use planemo try --update_test_data to generate one." % filename if mode == 'file': return response.content elif mode == 'directory': @@ -285,7 +285,7 @@ class GalaxyInteractorApi(object): else: # We can only use local data response = self._get("tools/%s/test_data_path?filename=%s" % (tool_id, filename), admin=True) - assert response.status_code == 200, "Test file (%s) is missing. Try --update_test_data to generate one." % filename + assert response.status_code == 200, "Test file (%s) is missing. If you use planemo try --update_test_data to generate one." % filename file_name = response.json() if mode == 'file': return open(file_name, mode='rb')