MirroredRepos/thefuck
1
0
Fork 0
mirror of https://github.com/nvbn/thefuck.git synced 2025-09-24 14:12:34 +01:00
Code Issues Releases Wiki Activity

Fix skipif on fish tests

Browse Source
This commit is contained in:
nvbn
2015-07-25 03:38:17 +03:00
parent b2457d1587
commit 7770efb86c
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/functional/test_fish.py
View File

@@ -20,7 +20,7 @@ RUN pip2 install -U pip setuptools
@functional @functional
@pytest.mark.skipif( @pytest.mark.skipif(
bare, reason='https://github.com/travis-ci/apt-source-whitelist/issues/71') bool(bare), reason='https://github.com/travis-ci/apt-source-whitelist/issues/71')
@pytest.mark.parametrize('tag, dockerfile', containers) @pytest.mark.parametrize('tag, dockerfile', containers)
def test_with_confirmation(tag, dockerfile): def test_with_confirmation(tag, dockerfile):
with spawn(tag, dockerfile, u'fish') as proc: with spawn(tag, dockerfile, u'fish') as proc:
@@ -31,7 +31,7 @@ def test_with_confirmation(tag, dockerfile):
@functional @functional
@pytest.mark.skipif( @pytest.mark.skipif(
bare, reason='https://github.com/travis-ci/apt-source-whitelist/issues/71') bool(bare), reason='https://github.com/travis-ci/apt-source-whitelist/issues/71')
@pytest.mark.parametrize('tag, dockerfile', containers) @pytest.mark.parametrize('tag, dockerfile', containers)
def test_refuse_with_confirmation(tag, dockerfile): def test_refuse_with_confirmation(tag, dockerfile):
with spawn(tag, dockerfile, u'fish') as proc: with spawn(tag, dockerfile, u'fish') as proc:
@@ -42,7 +42,7 @@ def test_refuse_with_confirmation(tag, dockerfile):
@functional @functional
@pytest.mark.skipif( @pytest.mark.skipif(
bare, reason='https://github.com/travis-ci/apt-source-whitelist/issues/71') bool(bare), reason='https://github.com/travis-ci/apt-source-whitelist/issues/71')
@pytest.mark.parametrize('tag, dockerfile', containers) @pytest.mark.parametrize('tag, dockerfile', containers)
def test_without_confirmation(tag, dockerfile): def test_without_confirmation(tag, dockerfile):
with spawn(tag, dockerfile, u'fish') as proc: with spawn(tag, dockerfile, u'fish') as proc:

1
tests/functional/utils.py
View File

@@ -25,7 +25,6 @@ def build_container(tag, dockerfile):
@contextmanager @contextmanager
def spawn(tag, dockerfile, cmd): def spawn(tag, dockerfile, cmd):
raise Exception([bare, enabled])
if bare: if bare:
proc = pexpect.spawnu(cmd) proc = pexpect.spawnu(cmd)
else: else: