From a0017eb07480719c99f0bf8aa7b4c7dd3dac97f6 Mon Sep 17 00:00:00 2001 From: Akita Noek Date: Fri, 8 Jul 2016 12:33:32 -0400 Subject: [PATCH] Skip troublesome old job tests These are actively being worked on by matburt and cmeyers, merging these skips because the otherwise unrelated test failures are causing headaches for the UI team. --- awx/main/tests/old/api/job_tasks.py | 4 ++++ awx/main/tests/old/jobs/job_relaunch.py | 3 +++ 2 files changed, 7 insertions(+) diff --git a/awx/main/tests/old/api/job_tasks.py b/awx/main/tests/old/api/job_tasks.py index 93861f8d56..2471f9e614 100644 --- a/awx/main/tests/old/api/job_tasks.py +++ b/awx/main/tests/old/api/job_tasks.py @@ -1,6 +1,9 @@ # Copyright (c) 2015 Ansible, Inc. # All Rights Reserved. +import os +import unittest2 as unittest + from django.conf import settings from django.test import LiveServerTestCase from django.test.utils import override_settings @@ -8,6 +11,7 @@ from django.test.utils import override_settings from awx.main.tests.job_base import BaseJobTestMixin +@unittest.skipIf(os.environ.get('SKIP_SLOW_TESTS', False), 'Skipping slow test') @override_settings(CELERY_ALWAYS_EAGER=True, CELERY_EAGER_PROPAGATES_EXCEPTIONS=True, ANSIBLE_TRANSPORT='local') diff --git a/awx/main/tests/old/jobs/job_relaunch.py b/awx/main/tests/old/jobs/job_relaunch.py index 437c6ed099..3a9e050288 100644 --- a/awx/main/tests/old/jobs/job_relaunch.py +++ b/awx/main/tests/old/jobs/job_relaunch.py @@ -4,6 +4,8 @@ # Python from __future__ import absolute_import import json +import os +import unittest2 as unittest # Django from django.core.urlresolvers import reverse @@ -15,6 +17,7 @@ from awx.main.tests.job_base import BaseJobTestMixin __all__ = ['JobRelaunchTest',] +@unittest.skipIf(os.environ.get('SKIP_SLOW_TESTS', False), 'Skipping slow test') class JobRelaunchTest(BaseJobTestMixin, BaseLiveServerTest): def test_job_relaunch(self):