MirroredRepos/thefuck
1
0
Fork 0
mirror of https://github.com/nvbn/thefuck.git synced 2025-10-31 15:12:20 +00:00
Code Issues Releases Wiki Activity

Use only one skipif

Browse Source
This commit is contained in:
nvbn
2015-07-25 03:33:30 +03:00
parent 129d67f794
commit 2291a5ba5d
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/functional/test_fish.py
View File

@@ -1,7 +1,7 @@
import pytest
from tests.functional.plots import with_confirmation, without_confirmation, \
refuse_with_confirmation
from tests.functional.utils import spawn, functional, images, bare
from tests.functional.utils import spawn, images, bare, enabled
containers = images(('ubuntu-python3-fish', u'''
FROM ubuntu:latest
@@ -18,9 +18,8 @@ RUN pip2 install -U pip setuptools
'''))
@functional
@pytest.mark.skipif(
bare, 'https://github.com/travis-ci/apt-source-whitelist/issues/71')
bare or not enabled, 'https://github.com/travis-ci/apt-source-whitelist/issues/71')
@pytest.mark.parametrize('tag, dockerfile', containers)
def test_with_confirmation(tag, dockerfile):
with spawn(tag, dockerfile, u'fish') as proc:
@@ -29,9 +28,8 @@ def test_with_confirmation(tag, dockerfile):
with_confirmation(proc)
@functional
@pytest.mark.skipif(
bare, 'https://github.com/travis-ci/apt-source-whitelist/issues/71')
bare or not enabled, 'https://github.com/travis-ci/apt-source-whitelist/issues/71')
@pytest.mark.parametrize('tag, dockerfile', containers)
def test_refuse_with_confirmation(tag, dockerfile):
with spawn(tag, dockerfile, u'fish') as proc:
@@ -40,9 +38,8 @@ def test_refuse_with_confirmation(tag, dockerfile):
refuse_with_confirmation(proc)
@functional
@pytest.mark.skipif(
bare, 'https://github.com/travis-ci/apt-source-whitelist/issues/71')
bare or not enabled, 'https://github.com/travis-ci/apt-source-whitelist/issues/71')
@pytest.mark.parametrize('tag, dockerfile', containers)
def test_without_confirmation(tag, dockerfile):
with spawn(tag, dockerfile, u'fish') as proc:

3
tests/functional/utils.py
View File

@@ -10,6 +10,7 @@ import pytest
root = str(Path(__file__).parent.parent.parent.resolve())
bare = os.environ.get('BARE')
enabled = os.environ.get('FUNCTIONAL')
def build_container(tag, dockerfile):
@@ -49,5 +50,5 @@ def images(*items):
functional = pytest.mark.skipif(
not os.environ.get('FUNCTIONAL'),
not enabled,
reason='Functional tests are disabled by default.')