From 08479b2300571306acaa49a0605172d74845891d Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Tue, 28 Nov 2017 15:31:35 -0800 Subject: [PATCH] Use pytest in cb-auto tests --- letsencrypt-auto-source/Dockerfile.centos6 | 7 ++++--- letsencrypt-auto-source/Dockerfile.precise | 7 ++++--- letsencrypt-auto-source/Dockerfile.trusty | 7 ++++--- letsencrypt-auto-source/Dockerfile.wheezy | 7 ++++--- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/letsencrypt-auto-source/Dockerfile.centos6 b/letsencrypt-auto-source/Dockerfile.centos6 index a941ede1f..7adfa11f6 100644 --- a/letsencrypt-auto-source/Dockerfile.centos6 +++ b/letsencrypt-auto-source/Dockerfile.centos6 @@ -5,12 +5,13 @@ FROM centos:6 RUN yum install -y epel-release -# Install pip, sudo and nose: +# Install pip, sudo and pytest: RUN yum install -y python-pip sudo # Use pipstrap to install a stable and tested version of pip COPY ./pieces/pipstrap.py /opt RUN /opt/pipstrap.py -RUN pip install nose +# Pin pytest version for increased stability +RUN pip install pytest==3.2.5 # Add an unprivileged user: RUN useradd --create-home --home-dir /home/lea --shell /bin/bash --groups wheel --uid 1000 lea @@ -32,4 +33,4 @@ COPY . /home/lea/certbot/letsencrypt-auto-source USER lea WORKDIR /home/lea -CMD ["nosetests", "-v", "-s", "certbot/letsencrypt-auto-source/tests"] +CMD ["pytest", "-v", "-s", "certbot/letsencrypt-auto-source/tests"] diff --git a/letsencrypt-auto-source/Dockerfile.precise b/letsencrypt-auto-source/Dockerfile.precise index a654a4ebc..8ade16995 100644 --- a/letsencrypt-auto-source/Dockerfile.precise +++ b/letsencrypt-auto-source/Dockerfile.precise @@ -6,7 +6,7 @@ FROM ubuntu:precise # Add an unprivileged user: RUN useradd --create-home --home-dir /home/lea --shell /bin/bash --groups sudo --uid 1000 lea -# Install pip, sudo, openssl, and nose: +# Install pip, sudo, openssl, and pytest: RUN apt-get update && \ apt-get -q -y install python-pip sudo openssl && \ apt-get clean @@ -14,7 +14,8 @@ RUN apt-get update && \ # Use pipstrap to install a stable and tested version of pip COPY ./pieces/pipstrap.py /opt RUN /opt/pipstrap.py -RUN pip install nose +# Pin pytest version for increased stability +RUN pip install pytest==3.2.5 # Let that user sudo: RUN sed -i.bkp -e \ @@ -32,4 +33,4 @@ COPY . /home/lea/certbot/letsencrypt-auto-source USER lea WORKDIR /home/lea -CMD ["nosetests", "-v", "-s", "certbot/letsencrypt-auto-source/tests"] +CMD ["pytest", "-v", "-s", "certbot/letsencrypt-auto-source/tests"] diff --git a/letsencrypt-auto-source/Dockerfile.trusty b/letsencrypt-auto-source/Dockerfile.trusty index 424401dcc..6c9371189 100644 --- a/letsencrypt-auto-source/Dockerfile.trusty +++ b/letsencrypt-auto-source/Dockerfile.trusty @@ -11,14 +11,15 @@ RUN sed -i.bkp -e \ 's/%sudo\s\+ALL=(ALL\(:ALL\)\?)\s\+ALL/%sudo ALL=NOPASSWD:ALL/g' \ /etc/sudoers -# Install pip and nose: +# Install pip and pytest: RUN apt-get update && \ apt-get -q -y install python-pip && \ apt-get clean # Use pipstrap to install a stable and tested version of pip COPY ./pieces/pipstrap.py /opt RUN /opt/pipstrap.py -RUN pip install nose +# Pin pytest version for increased stability +RUN pip install pytest==3.2.5 RUN mkdir -p /home/lea/certbot @@ -32,4 +33,4 @@ COPY . /home/lea/certbot/letsencrypt-auto-source USER lea WORKDIR /home/lea -CMD ["nosetests", "-v", "-s", "certbot/letsencrypt-auto-source/tests"] +CMD ["pytest", "-v", "-s", "certbot/letsencrypt-auto-source/tests"] diff --git a/letsencrypt-auto-source/Dockerfile.wheezy b/letsencrypt-auto-source/Dockerfile.wheezy index 24a2a6356..0402d2e45 100644 --- a/letsencrypt-auto-source/Dockerfile.wheezy +++ b/letsencrypt-auto-source/Dockerfile.wheezy @@ -6,14 +6,15 @@ FROM debian:wheezy # Add an unprivileged user: RUN useradd --create-home --home-dir /home/lea --shell /bin/bash --groups sudo --uid 1000 lea -# Install pip, sudo, openssl, and nose: +# Install pip, sudo, openssl, and pytest: RUN apt-get update && \ apt-get -q -y install python-pip sudo openssl && \ apt-get clean # Use pipstrap to install a stable and tested version of pip COPY ./pieces/pipstrap.py /opt RUN /opt/pipstrap.py -RUN pip install nose +# Pin pytest version for increased stability +RUN pip install pytest==3.2.5 # Let that user sudo: RUN sed -i.bkp -e \ @@ -31,4 +32,4 @@ COPY . /home/lea/certbot/letsencrypt-auto-source USER lea WORKDIR /home/lea -CMD ["nosetests", "-v", "-s", "certbot/letsencrypt-auto-source/tests"] +CMD ["pytest", "-v", "-s", "certbot/letsencrypt-auto-source/tests"]