MirroredRepos/thefuck
1
0
Fork 0
mirror of https://github.com/nvbn/thefuck.git synced 2025-10-31 07:04:12 +00:00
Code Issues Releases Wiki Activity

Merge pull request #564 from josephfrazier/docker-python

Browse Source 
Use official Python images for Docker tests
This commit is contained in:
Vladimir Iakovlev
2016-10-07 10:38:49 +02:00
committed by GitHub
parent 02f717a0e8 16a440cb9d
commit 4d714994a3
5 changed files with 24 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/functional/test_bash.py
View File

@@ -3,18 +3,11 @@ from tests.functional.plots import with_confirmation, without_confirmation, \
refuse_with_confirmation, history_changed, history_not_changed, \ refuse_with_confirmation, history_changed, history_not_changed, \
select_command_with_arrows, how_to_configure select_command_with_arrows, how_to_configure
containers = ((u'thefuck/ubuntu-python3-bash', containers = ((u'thefuck/python3-bash',
u'''FROM ubuntu:latest u'FROM python:3',
RUN apt-get update
RUN apt-get install -yy python3 python3-pip python3-dev git
RUN pip3 install -U setuptools
RUN ln -s /usr/bin/pip3 /usr/bin/pip''',
u'bash'), u'bash'),
(u'thefuck/ubuntu-python2-bash', (u'thefuck/python2-bash',
u'''FROM ubuntu:latest u'FROM python:2',
RUN apt-get update
RUN apt-get install -yy python python-pip python-dev git
RUN pip2 install -U pip setuptools''',
u'bash')) u'bash'))

19
tests/functional/test_fish.py
View File

@@ -2,19 +2,20 @@ import pytest
from tests.functional.plots import with_confirmation, without_confirmation, \ from tests.functional.plots import with_confirmation, without_confirmation, \
refuse_with_confirmation, select_command_with_arrows refuse_with_confirmation, select_command_with_arrows
containers = (('thefuck/ubuntu-python3-fish', containers = (('thefuck/python3-fish',
u'''FROM ubuntu:latest u'''FROM python:3
# Use jessie-backports since it has the fish package. See here for details:
# https://github.com/tianon/docker-brew-debian/blob/88ae21052affd8a14553bb969f9d41c464032122/jessie/backports/Dockerfile
RUN awk '$1 ~ "^deb" { $3 = $3 "-backports"; print; exit }' /etc/apt/sources.list > /etc/apt/sources.list.d/backports.list
RUN apt-get update RUN apt-get update
RUN apt-get install -yy python3 python3-pip python3-dev fish git
RUN pip3 install -U setuptools
RUN ln -s /usr/bin/pip3 /usr/bin/pip
RUN apt-get install -yy fish''', RUN apt-get install -yy fish''',
u'fish'), u'fish'),
('thefuck/ubuntu-python2-fish', ('thefuck/python2-fish',
u'''FROM ubuntu:latest u'''FROM python:2
# Use jessie-backports since it has the fish package. See here for details:
# https://github.com/tianon/docker-brew-debian/blob/88ae21052affd8a14553bb969f9d41c464032122/jessie/backports/Dockerfile
RUN awk '$1 ~ "^deb" { $3 = $3 "-backports"; print; exit }' /etc/apt/sources.list > /etc/apt/sources.list.d/backports.list
RUN apt-get update RUN apt-get update
RUN apt-get install -yy python python-pip python-dev git
RUN pip2 install -U pip setuptools
RUN apt-get install -yy fish''', RUN apt-get install -yy fish''',
u'fish')) u'fish'))

8
tests/functional/test_performance.py
View File

@@ -2,11 +2,7 @@ import pytest
import time import time
dockerfile = u''' dockerfile = u'''
FROM ubuntu:latest FROM python:3
RUN apt-get update
RUN apt-get install -yy python3 python3-pip python3-dev git
RUN pip3 install -U setuptools
RUN ln -s /usr/bin/pip3 /usr/bin/pip
RUN adduser --disabled-password --gecos '' test RUN adduser --disabled-password --gecos '' test
ENV SEED "{seed}" ENV SEED "{seed}"
WORKDIR /src WORKDIR /src
@@ -42,7 +38,7 @@ def plot(proc, TIMEOUT):
@pytest.mark.functional @pytest.mark.functional
@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/python3-bash-performance',
dockerfile, u'bash') dockerfile, u'bash')
proc.sendline(u'pip install /src') proc.sendline(u'pip install /src')
proc.sendline(u'su test') proc.sendline(u'su test')

13
tests/functional/test_tcsh.py
View File

@@ -2,19 +2,14 @@ import pytest
from tests.functional.plots import with_confirmation, without_confirmation, \ from tests.functional.plots import with_confirmation, without_confirmation, \
refuse_with_confirmation, select_command_with_arrows refuse_with_confirmation, select_command_with_arrows
containers = (('thefuck/ubuntu-python3-tcsh', containers = (('thefuck/python3-tcsh',
u'''FROM ubuntu:latest u'''FROM python:3
RUN apt-get update RUN apt-get update
RUN apt-get install -yy python3 python3-pip python3-dev git
RUN pip3 install -U setuptools
RUN ln -s /usr/bin/pip3 /usr/bin/pip
RUN apt-get install -yy tcsh''', RUN apt-get install -yy tcsh''',
u'tcsh'), u'tcsh'),
('thefuck/ubuntu-python2-tcsh', ('thefuck/python2-tcsh',
u'''FROM ubuntu:latest u'''FROM python:2
RUN apt-get update RUN apt-get update
RUN apt-get install -yy python python-pip python-dev git
RUN pip2 install -U pip setuptools
RUN apt-get install -yy tcsh''', RUN apt-get install -yy tcsh''',
u'tcsh')) u'tcsh'))

13
tests/functional/test_zsh.py
View File

@@ -3,19 +3,14 @@ from tests.functional.plots import with_confirmation, without_confirmation, \
refuse_with_confirmation, history_changed, history_not_changed, \ refuse_with_confirmation, history_changed, history_not_changed, \
select_command_with_arrows, how_to_configure select_command_with_arrows, how_to_configure
containers = (('thefuck/ubuntu-python3-zsh', containers = (('thefuck/python3-zsh',
u'''FROM ubuntu:latest u'''FROM python:3
RUN apt-get update RUN apt-get update
RUN apt-get install -yy python3 python3-pip python3-dev git
RUN pip3 install -U setuptools
RUN ln -s /usr/bin/pip3 /usr/bin/pip
RUN apt-get install -yy zsh''', RUN apt-get install -yy zsh''',
u'zsh'), u'zsh'),
('thefuck/ubuntu-python2-zsh', ('thefuck/python2-zsh',
u'''FROM ubuntu:latest u'''FROM python:2
RUN apt-get update RUN apt-get update
RUN apt-get install -yy python python-pip python-dev git
RUN pip2 install -U pip setuptools
RUN apt-get install -yy zsh''', RUN apt-get install -yy zsh''',
u'zsh')) u'zsh'))