From ccea1eeb8f2a8dd7fcf7b0f8643c4f067ce4c1ea Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Tue, 7 May 2019 18:53:59 +0200 Subject: [PATCH] Delete running jobs after each API-style test Should prevent https://jenkins.galaxyproject.org/job/docker-integration-py3/159/testReport/junit/test.integration.test_upload_configuration_options/AdminsCanPasteFilePathsTestCase/test_admin_path_paste_libraries/ --- test/base/api.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test/base/api.py b/test/base/api.py index 8b98da97abf..45988fb9bc6 100644 --- a/test/base/api.py +++ b/test/base/api.py @@ -1,3 +1,4 @@ +import os from contextlib import contextmanager from six.moves.urllib.parse import urlencode @@ -22,6 +23,12 @@ from .testcase import FunctionalTestCase class UsesApiTestCaseMixin(object): + def tearDown(self): + if os.environ.get('GALAXY_TEST_EXTERNAL') is None: + # Only kill running jobs after test for managed test instances + for job in self.galaxy_interactor.get('jobs?state=running&?user_details=true').json(): + self._delete("jobs/%s" % job['id']) + def _api_url(self, path, params=None, use_key=None, use_admin_key=None): if not params: params = {}