MirroredRepos/thefuck
1
0
Fork 0
mirror of https://github.com/nvbn/thefuck.git synced 2025-01-19 04:21:14 +00:00
Code Issues Releases Wiki Activity

#N/A: Remove ability to run functional tests without docker

Browse Source
This commit is contained in:
Vladimir Iakovlev 2016-08-13 14:11:18 +03:00
parent 51415a5cb1
commit 087584a1e0
5 changed files with 14 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/functional/test_bash.py
View File

@ -19,9 +19,8 @@ containers = ((u'thefuck/ubuntu-python3-bash',
@pytest.fixture(params=containers) @pytest.fixture(params=containers)
def proc(request, spawnu, run_without_docker): def proc(request, spawnu):
proc = spawnu(*request.param) 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"export PS1='$ '")
proc.sendline(u'eval $(thefuck --alias)') proc.sendline(u'eval $(thefuck --alias)')
@ -30,38 +29,29 @@ def proc(request, spawnu, run_without_docker):
@pytest.mark.functional @pytest.mark.functional
@pytest.mark.once_without_docker def test_with_confirmation(proc, TIMEOUT):
def test_with_confirmation(proc, TIMEOUT, run_without_docker):
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.functional
@pytest.mark.once_without_docker def test_select_command_with_arrows(proc, TIMEOUT):
def test_select_command_with_arrows(proc, TIMEOUT, run_without_docker):
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.functional
@pytest.mark.once_without_docker def test_refuse_with_confirmation(proc, TIMEOUT):
def test_refuse_with_confirmation(proc, TIMEOUT, run_without_docker):
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.functional
@pytest.mark.once_without_docker def test_without_confirmation(proc, TIMEOUT):
def test_without_confirmation(proc, TIMEOUT, run_without_docker):
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.functional
@pytest.mark.once_without_docker
def test_how_to_configure_alias(proc, TIMEOUT): def test_how_to_configure_alias(proc, TIMEOUT):
how_to_configure(proc, TIMEOUT) how_to_configure(proc, TIMEOUT)

4
tests/functional/test_fish.py
View File

@ -29,25 +29,21 @@ def proc(request, spawnu):
@pytest.mark.functional @pytest.mark.functional
@pytest.mark.once_without_docker
def test_with_confirmation(proc, TIMEOUT): def test_with_confirmation(proc, TIMEOUT):
with_confirmation(proc, TIMEOUT) with_confirmation(proc, TIMEOUT)
@pytest.mark.functional @pytest.mark.functional
@pytest.mark.once_without_docker
def test_select_command_with_arrows(proc, TIMEOUT): def test_select_command_with_arrows(proc, TIMEOUT):
select_command_with_arrows(proc, TIMEOUT) select_command_with_arrows(proc, TIMEOUT)
@pytest.mark.functional @pytest.mark.functional
@pytest.mark.once_without_docker
def test_refuse_with_confirmation(proc, TIMEOUT): def test_refuse_with_confirmation(proc, TIMEOUT):
refuse_with_confirmation(proc, TIMEOUT) refuse_with_confirmation(proc, TIMEOUT)
@pytest.mark.functional @pytest.mark.functional
@pytest.mark.once_without_docker
def test_without_confirmation(proc, TIMEOUT): def test_without_confirmation(proc, TIMEOUT):
without_confirmation(proc, TIMEOUT) without_confirmation(proc, TIMEOUT)

1
tests/functional/test_performance.py
View File

@ -40,7 +40,6 @@ def plot(proc, TIMEOUT):
@pytest.mark.functional @pytest.mark.functional
@pytest.mark.once_without_docker
@pytest.mark.benchmark(min_rounds=10) @pytest.mark.benchmark(min_rounds=10)
def test_performance(spawnu, TIMEOUT, benchmark): def test_performance(spawnu, TIMEOUT, benchmark):
proc = spawnu(u'thefuck/ubuntu-python3-bash-performance', proc = spawnu(u'thefuck/ubuntu-python3-bash-performance',

7
tests/functional/test_tcsh.py
View File

@ -20,9 +20,8 @@ containers = (('thefuck/ubuntu-python3-tcsh',
@pytest.fixture(params=containers) @pytest.fixture(params=containers)
def proc(request, spawnu, run_without_docker): def proc(request, spawnu):
proc = spawnu(*request.param) 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'tcsh')
proc.sendline(u'setenv PYTHONIOENCODING utf8') proc.sendline(u'setenv PYTHONIOENCODING utf8')
@ -31,25 +30,21 @@ def proc(request, spawnu, run_without_docker):
@pytest.mark.functional @pytest.mark.functional
@pytest.mark.once_without_docker
def test_with_confirmation(proc, TIMEOUT): def test_with_confirmation(proc, TIMEOUT):
with_confirmation(proc, TIMEOUT) with_confirmation(proc, TIMEOUT)
@pytest.mark.functional @pytest.mark.functional
@pytest.mark.once_without_docker
def test_select_command_with_arrows(proc, TIMEOUT): def test_select_command_with_arrows(proc, TIMEOUT):
select_command_with_arrows(proc, TIMEOUT) select_command_with_arrows(proc, TIMEOUT)
@pytest.mark.functional @pytest.mark.functional
@pytest.mark.once_without_docker
def test_refuse_with_confirmation(proc, TIMEOUT): def test_refuse_with_confirmation(proc, TIMEOUT):
refuse_with_confirmation(proc, TIMEOUT) refuse_with_confirmation(proc, TIMEOUT)
@pytest.mark.functional @pytest.mark.functional
@pytest.mark.once_without_docker
def test_without_confirmation(proc, TIMEOUT): def test_without_confirmation(proc, TIMEOUT):
without_confirmation(proc, TIMEOUT) without_confirmation(proc, TIMEOUT)

8
tests/functional/test_zsh.py
View File

@ -21,9 +21,8 @@ containers = (('thefuck/ubuntu-python3-zsh',
@pytest.fixture(params=containers) @pytest.fixture(params=containers)
def proc(request, spawnu, run_without_docker): def proc(request, spawnu):
proc = spawnu(*request.param) 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'eval $(thefuck --alias)')
proc.sendline(u'export HISTFILE=~/.zsh_history') proc.sendline(u'export HISTFILE=~/.zsh_history')
@ -35,34 +34,29 @@ def proc(request, spawnu, run_without_docker):
@pytest.mark.functional @pytest.mark.functional
@pytest.mark.once_without_docker
def test_with_confirmation(proc, TIMEOUT): def test_with_confirmation(proc, TIMEOUT):
with_confirmation(proc, TIMEOUT) with_confirmation(proc, TIMEOUT)
history_changed(proc, TIMEOUT, u'echo test') history_changed(proc, TIMEOUT, u'echo test')
@pytest.mark.functional @pytest.mark.functional
@pytest.mark.once_without_docker
def test_select_command_with_arrows(proc, TIMEOUT): def test_select_command_with_arrows(proc, TIMEOUT):
select_command_with_arrows(proc, TIMEOUT) select_command_with_arrows(proc, TIMEOUT)
history_changed(proc, TIMEOUT, u'git help') history_changed(proc, TIMEOUT, u'git help')
@pytest.mark.functional @pytest.mark.functional
@pytest.mark.once_without_docker
def test_refuse_with_confirmation(proc, TIMEOUT): def test_refuse_with_confirmation(proc, TIMEOUT):
refuse_with_confirmation(proc, TIMEOUT) refuse_with_confirmation(proc, TIMEOUT)
history_not_changed(proc, TIMEOUT) history_not_changed(proc, TIMEOUT)
@pytest.mark.functional @pytest.mark.functional
@pytest.mark.once_without_docker
def test_without_confirmation(proc, TIMEOUT): def test_without_confirmation(proc, TIMEOUT):
without_confirmation(proc, TIMEOUT) without_confirmation(proc, TIMEOUT)
history_changed(proc, TIMEOUT, u'echo test') history_changed(proc, TIMEOUT, u'echo test')
@pytest.mark.functional @pytest.mark.functional
@pytest.mark.once_without_docker
def test_how_to_configure_alias(proc, TIMEOUT): def test_how_to_configure_alias(proc, TIMEOUT):
how_to_configure(proc, TIMEOUT) how_to_configure(proc, TIMEOUT)