From 7770efb86c578e279075071c18549577bc87042c Mon Sep 17 00:00:00 2001 From: nvbn Date: Sat, 25 Jul 2015 03:38:17 +0300 Subject: [PATCH] Fix skipif on fish tests --- tests/functional/test_fish.py | 6 +++--- tests/functional/utils.py | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/functional/test_fish.py b/tests/functional/test_fish.py index e35b06c7..3f966d89 100644 --- a/tests/functional/test_fish.py +++ b/tests/functional/test_fish.py @@ -20,7 +20,7 @@ RUN pip2 install -U pip setuptools @functional @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) def test_with_confirmation(tag, dockerfile): with spawn(tag, dockerfile, u'fish') as proc: @@ -31,7 +31,7 @@ def test_with_confirmation(tag, dockerfile): @functional @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) def test_refuse_with_confirmation(tag, dockerfile): with spawn(tag, dockerfile, u'fish') as proc: @@ -42,7 +42,7 @@ def test_refuse_with_confirmation(tag, dockerfile): @functional @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) def test_without_confirmation(tag, dockerfile): with spawn(tag, dockerfile, u'fish') as proc: diff --git a/tests/functional/utils.py b/tests/functional/utils.py index 5277c7e6..1650ab0b 100644 --- a/tests/functional/utils.py +++ b/tests/functional/utils.py @@ -25,7 +25,6 @@ def build_container(tag, dockerfile): @contextmanager def spawn(tag, dockerfile, cmd): - raise Exception([bare, enabled]) if bare: proc = pexpect.spawnu(cmd) else: