mirror of
				https://github.com/nvbn/thefuck.git
				synced 2025-10-30 22:54:14 +00:00 
			
		
		
		
	#N/A: Remove ability to run functional tests without docker
This commit is contained in:
		| @@ -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) | ||||
|   | ||||
| @@ -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) | ||||
|  | ||||
|   | ||||
| @@ -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', | ||||
|   | ||||
| @@ -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) | ||||
|  | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user