Add BARE option for running functional tests without docker

tests/functional/test_zsh.py

@@ -1,29 +1,27 @@
 import pytest
-from tests.functional.utils import spawn, functional
+from tests.functional.utils import spawn, functional, images
 from tests.functional.plots import with_confirmation, without_confirmation,\
     refuse_with_confirmation
 
-containers = [('ubuntu-python3-zsh', '''
+containers = images(('ubuntu-python3-zsh', '''
 FROM ubuntu:latest
 RUN apt-get update
 RUN apt-get install -yy python3 python3-pip python3-dev zsh
 RUN pip3 install -U setuptools
 RUN ln -s /usr/bin/pip3 /usr/bin/pip
-CMD ["/bin/zsh"]
 '''),
               ('ubuntu-python2-zsh', '''
 FROM ubuntu:latest
 RUN apt-get update
 RUN apt-get install -yy python python-pip python-dev zsh
 RUN pip2 install -U pip setuptools
-CMD ["/bin/zsh"]
-''')]
+'''))
 
 
 @functional
 @pytest.mark.parametrize('tag, dockerfile', containers)
 def test_with_confirmation(tag, dockerfile):
-    with spawn(tag, dockerfile) as proc:
+    with spawn(tag, dockerfile, 'zsh') as proc:
         proc.sendline('eval $(thefuck-alias)')
         with_confirmation(proc)
 
@@ -31,7 +29,7 @@ def test_with_confirmation(tag, dockerfile):
 @functional
 @pytest.mark.parametrize('tag, dockerfile', containers)
 def test_refuse_with_confirmation(tag, dockerfile):
-    with spawn(tag, dockerfile) as proc:
+    with spawn(tag, dockerfile, 'zsh') as proc:
         proc.sendline('eval $(thefuck-alias)')
         refuse_with_confirmation(proc)
 
@@ -39,7 +37,6 @@ def test_refuse_with_confirmation(tag, dockerfile):
 @functional
 @pytest.mark.parametrize('tag, dockerfile', containers)
 def test_without_confirmation(tag, dockerfile):
-    with spawn(tag, dockerfile) as proc:
-        proc.sendline('export THEFUCK_REQUIRE_CONFIRMATION=false')
+    with spawn(tag, dockerfile, 'zsh') as proc:
         proc.sendline('eval $(thefuck-alias)')
         without_confirmation(proc)