External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-09 02:17:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2876 from anoek/test-skips

Browse Source 
Skip troublesome old job tests
This commit is contained in:
Akita Noek
2016-07-08 12:54:43 -04:00
committed by GitHub
parent 6cb83052b4 a0017eb074
commit 52997ae0ac
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/tests/old/api/job_tasks.py
View File

@@ -1,6 +1,9 @@
# Copyright (c) 2015 Ansible, Inc. # Copyright (c) 2015 Ansible, Inc.
# All Rights Reserved. # All Rights Reserved.
import os
import unittest2 as unittest
from django.conf import settings from django.conf import settings
from django.test import LiveServerTestCase from django.test import LiveServerTestCase
from django.test.utils import override_settings 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 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, @override_settings(CELERY_ALWAYS_EAGER=True,
CELERY_EAGER_PROPAGATES_EXCEPTIONS=True, CELERY_EAGER_PROPAGATES_EXCEPTIONS=True,
ANSIBLE_TRANSPORT='local') ANSIBLE_TRANSPORT='local')

3
awx/main/tests/old/jobs/job_relaunch.py
View File

@@ -4,6 +4,8 @@
# Python # Python
from __future__ import absolute_import from __future__ import absolute_import
import json import json
import os
import unittest2 as unittest
# Django # Django
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
@@ -15,6 +17,7 @@ from awx.main.tests.job_base import BaseJobTestMixin
__all__ = ['JobRelaunchTest',] __all__ = ['JobRelaunchTest',]
@unittest.skipIf(os.environ.get('SKIP_SLOW_TESTS', False), 'Skipping slow test')
class JobRelaunchTest(BaseJobTestMixin, BaseLiveServerTest): class JobRelaunchTest(BaseJobTestMixin, BaseLiveServerTest):
def test_job_relaunch(self): def test_job_relaunch(self):