mirror of
				https://github.com/nvbn/thefuck.git
				synced 2025-10-30 22:54:14 +00:00 
			
		
		
		
	Fix tests with python 2
This commit is contained in:
		| @@ -3,14 +3,14 @@ from tests.functional.utils import spawn, functional, images | ||||
| from tests.functional.plots import with_confirmation, without_confirmation, \ | ||||
|     refuse_with_confirmation | ||||
|  | ||||
| containers = images(('ubuntu-python3-tcsh', ''' | ||||
| containers = images(('ubuntu-python3-tcsh', u''' | ||||
| FROM ubuntu:latest | ||||
| RUN apt-get update | ||||
| RUN apt-get install -yy python3 python3-pip python3-dev tcsh | ||||
| RUN pip3 install -U setuptools | ||||
| RUN ln -s /usr/bin/pip3 /usr/bin/pip | ||||
| '''), | ||||
|                     ('ubuntu-python2-tcsh', ''' | ||||
|                     ('ubuntu-python2-tcsh', u''' | ||||
| FROM ubuntu:latest | ||||
| RUN apt-get update | ||||
| RUN apt-get install -yy python python-pip python-dev tcsh | ||||
| @@ -21,25 +21,25 @@ RUN pip2 install -U pip setuptools | ||||
| @functional | ||||
| @pytest.mark.parametrize('tag, dockerfile', containers) | ||||
| def test_with_confirmation(tag, dockerfile): | ||||
|     with spawn(tag, dockerfile, 'tcsh') as proc: | ||||
|         proc.sendline('tcsh') | ||||
|         proc.sendline('eval `thefuck-alias`') | ||||
|     with spawn(tag, dockerfile, u'tcsh') as proc: | ||||
|         proc.sendline(u'tcsh') | ||||
|         proc.sendline(u'eval `thefuck-alias`') | ||||
|         with_confirmation(proc) | ||||
|  | ||||
|  | ||||
| @functional | ||||
| @pytest.mark.parametrize('tag, dockerfile', containers) | ||||
| def test_refuse_with_confirmation(tag, dockerfile): | ||||
|     with spawn(tag, dockerfile, 'tcsh') as proc: | ||||
|         proc.sendline('tcsh') | ||||
|         proc.sendline('eval `thefuck-alias`') | ||||
|     with spawn(tag, dockerfile, u'tcsh') as proc: | ||||
|         proc.sendline(u'tcsh') | ||||
|         proc.sendline(u'eval `thefuck-alias`') | ||||
|         refuse_with_confirmation(proc) | ||||
|  | ||||
|  | ||||
| @functional | ||||
| @pytest.mark.parametrize('tag, dockerfile', containers) | ||||
| def test_without_confirmation(tag, dockerfile): | ||||
|     with spawn(tag, dockerfile, 'tcsh') as proc: | ||||
|         proc.sendline('tcsh') | ||||
|         proc.sendline('eval `thefuck-alias`') | ||||
|     with spawn(tag, dockerfile, u'tcsh') as proc: | ||||
|         proc.sendline(u'tcsh') | ||||
|         proc.sendline(u'eval `thefuck-alias`') | ||||
|         without_confirmation(proc) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user