From 885d9d1766c46ea59fb61b607a2df9781e3f0e33 Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Wed, 17 Apr 2019 16:30:24 +0200 Subject: [PATCH] Fix err_msg assertion --- lib/galaxy/managers/base.py | 2 +- test/api/test_datasets.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/galaxy/managers/base.py b/lib/galaxy/managers/base.py index 094bc068d5b..a2e15ab79dd 100644 --- a/lib/galaxy/managers/base.py +++ b/lib/galaxy/managers/base.py @@ -1123,5 +1123,5 @@ class ModelFilterParser(HasAModelManager): return date_string raise ValueError('datetime strings must be in the ISO 8601 format and in the UTC') - def raise_filter_err(attr, op, val, msg): + def raise_filter_err(self, attr, op, val, msg): raise exceptions.RequestParameterInvalidException(msg, column=attr, operation=op, val=val) diff --git a/test/api/test_datasets.py b/test/api/test_datasets.py index d8cea6f3939..2e64c5fbce4 100644 --- a/test/api/test_datasets.py +++ b/test/api/test_datasets.py @@ -86,7 +86,7 @@ class DatasetsApiTestCase(api.ApiTestCase): payload = {'limit': 10, 'offset': 0, 'q': ['history_content_type', 'tag-invalid_op'], 'qv': ['dataset', 'notag']} index_response = self._get("datasets", payload) self._assert_status_code_is(index_response, 400) - assert index_response.json()['err_msg'] == 'bad filter' + assert index_response.json()['err_msg'] == 'bad op in filter' def test_show(self): hda1 = self.dataset_populator.new_dataset(self.history_id)