From 087584a1e0cf65049609f2e4c36dd2e8f42af6e5 Mon Sep 17 00:00:00 2001 From: Vladimir Iakovlev Date: Sat, 13 Aug 2016 14:11:18 +0300 Subject: [PATCH] #N/A: Remove ability to run functional tests without docker --- tests/functional/test_bash.py | 30 ++++++++++------------------ tests/functional/test_fish.py | 4 ---- tests/functional/test_performance.py | 1 - tests/functional/test_tcsh.py | 9 ++------- tests/functional/test_zsh.py | 10 ++-------- 5 files changed, 14 insertions(+), 40 deletions(-) diff --git a/tests/functional/test_bash.py b/tests/functional/test_bash.py index 14ab8fd..5ce8ba8 100644 --- a/tests/functional/test_bash.py +++ b/tests/functional/test_bash.py @@ -19,10 +19,9 @@ containers = ((u'thefuck/ubuntu-python3-bash', @pytest.fixture(params=containers) -def proc(request, spawnu, run_without_docker): +def proc(request, spawnu): proc = spawnu(*request.param) - if not run_without_docker: - proc.sendline(u"pip install /src") + proc.sendline(u"pip install /src") proc.sendline(u"export PS1='$ '") proc.sendline(u'eval $(thefuck --alias)') proc.sendline(u'echo > $HISTFILE') @@ -30,38 +29,29 @@ def proc(request, spawnu, run_without_docker): @pytest.mark.functional -@pytest.mark.once_without_docker -def test_with_confirmation(proc, TIMEOUT, run_without_docker): +def test_with_confirmation(proc, TIMEOUT): with_confirmation(proc, TIMEOUT) - if not run_without_docker: - history_changed(proc, TIMEOUT, u'echo test') + history_changed(proc, TIMEOUT, u'echo test') @pytest.mark.functional -@pytest.mark.once_without_docker -def test_select_command_with_arrows(proc, TIMEOUT, run_without_docker): +def test_select_command_with_arrows(proc, TIMEOUT): select_command_with_arrows(proc, TIMEOUT) - if not run_without_docker: - history_changed(proc, TIMEOUT, u'git help') + history_changed(proc, TIMEOUT, u'git help') @pytest.mark.functional -@pytest.mark.once_without_docker -def test_refuse_with_confirmation(proc, TIMEOUT, run_without_docker): +def test_refuse_with_confirmation(proc, TIMEOUT): refuse_with_confirmation(proc, TIMEOUT) - if not run_without_docker: - history_not_changed(proc, TIMEOUT) + history_not_changed(proc, TIMEOUT) @pytest.mark.functional -@pytest.mark.once_without_docker -def test_without_confirmation(proc, TIMEOUT, run_without_docker): +def test_without_confirmation(proc, TIMEOUT): without_confirmation(proc, TIMEOUT) - if not run_without_docker: - history_changed(proc, TIMEOUT, u'echo test') + history_changed(proc, TIMEOUT, u'echo test') @pytest.mark.functional -@pytest.mark.once_without_docker def test_how_to_configure_alias(proc, TIMEOUT): how_to_configure(proc, TIMEOUT) diff --git a/tests/functional/test_fish.py b/tests/functional/test_fish.py index ce7e01e..5436180 100644 --- a/tests/functional/test_fish.py +++ b/tests/functional/test_fish.py @@ -29,25 +29,21 @@ def proc(request, spawnu): @pytest.mark.functional -@pytest.mark.once_without_docker def test_with_confirmation(proc, TIMEOUT): with_confirmation(proc, TIMEOUT) @pytest.mark.functional -@pytest.mark.once_without_docker def test_select_command_with_arrows(proc, TIMEOUT): select_command_with_arrows(proc, TIMEOUT) @pytest.mark.functional -@pytest.mark.once_without_docker def test_refuse_with_confirmation(proc, TIMEOUT): refuse_with_confirmation(proc, TIMEOUT) @pytest.mark.functional -@pytest.mark.once_without_docker def test_without_confirmation(proc, TIMEOUT): without_confirmation(proc, TIMEOUT) diff --git a/tests/functional/test_performance.py b/tests/functional/test_performance.py index f0917ec..d935aec 100644 --- a/tests/functional/test_performance.py +++ b/tests/functional/test_performance.py @@ -40,7 +40,6 @@ def plot(proc, TIMEOUT): @pytest.mark.functional -@pytest.mark.once_without_docker @pytest.mark.benchmark(min_rounds=10) def test_performance(spawnu, TIMEOUT, benchmark): proc = spawnu(u'thefuck/ubuntu-python3-bash-performance', diff --git a/tests/functional/test_tcsh.py b/tests/functional/test_tcsh.py index c5cc5a6..4273f53 100644 --- a/tests/functional/test_tcsh.py +++ b/tests/functional/test_tcsh.py @@ -20,10 +20,9 @@ containers = (('thefuck/ubuntu-python3-tcsh', @pytest.fixture(params=containers) -def proc(request, spawnu, run_without_docker): +def proc(request, spawnu): proc = spawnu(*request.param) - if not run_without_docker: - proc.sendline(u'pip install /src') + proc.sendline(u'pip install /src') proc.sendline(u'tcsh') proc.sendline(u'setenv PYTHONIOENCODING utf8') proc.sendline(u'eval `thefuck --alias`') @@ -31,25 +30,21 @@ def proc(request, spawnu, run_without_docker): @pytest.mark.functional -@pytest.mark.once_without_docker def test_with_confirmation(proc, TIMEOUT): with_confirmation(proc, TIMEOUT) @pytest.mark.functional -@pytest.mark.once_without_docker def test_select_command_with_arrows(proc, TIMEOUT): select_command_with_arrows(proc, TIMEOUT) @pytest.mark.functional -@pytest.mark.once_without_docker def test_refuse_with_confirmation(proc, TIMEOUT): refuse_with_confirmation(proc, TIMEOUT) @pytest.mark.functional -@pytest.mark.once_without_docker def test_without_confirmation(proc, TIMEOUT): without_confirmation(proc, TIMEOUT) diff --git a/tests/functional/test_zsh.py b/tests/functional/test_zsh.py index c0df1f0..0a6540a 100644 --- a/tests/functional/test_zsh.py +++ b/tests/functional/test_zsh.py @@ -21,10 +21,9 @@ containers = (('thefuck/ubuntu-python3-zsh', @pytest.fixture(params=containers) -def proc(request, spawnu, run_without_docker): +def proc(request, spawnu): proc = spawnu(*request.param) - if not run_without_docker: - proc.sendline(u'pip install /src') + proc.sendline(u'pip install /src') proc.sendline(u'eval $(thefuck --alias)') proc.sendline(u'export HISTFILE=~/.zsh_history') proc.sendline(u'echo > $HISTFILE') @@ -35,34 +34,29 @@ def proc(request, spawnu, run_without_docker): @pytest.mark.functional -@pytest.mark.once_without_docker def test_with_confirmation(proc, TIMEOUT): with_confirmation(proc, TIMEOUT) history_changed(proc, TIMEOUT, u'echo test') @pytest.mark.functional -@pytest.mark.once_without_docker def test_select_command_with_arrows(proc, TIMEOUT): select_command_with_arrows(proc, TIMEOUT) history_changed(proc, TIMEOUT, u'git help') @pytest.mark.functional -@pytest.mark.once_without_docker def test_refuse_with_confirmation(proc, TIMEOUT): refuse_with_confirmation(proc, TIMEOUT) history_not_changed(proc, TIMEOUT) @pytest.mark.functional -@pytest.mark.once_without_docker def test_without_confirmation(proc, TIMEOUT): without_confirmation(proc, TIMEOUT) history_changed(proc, TIMEOUT, u'echo test') @pytest.mark.functional -@pytest.mark.once_without_docker def test_how_to_configure_alias(proc, TIMEOUT): how_to_configure(proc, TIMEOUT)