From 36ad06cabeedcce5e38ffa435a8287e9d9887f5c Mon Sep 17 00:00:00 2001 From: Tim Orling Date: Thu, 6 Oct 2016 08:47:04 -0700 Subject: Initial commit of epel7 tests Signed-off-by: Tim Orling --- Dockerfile | 2 +- build_and_run.sh | 6 +++--- tests/test_rhbz1369486.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 05cb21c..b336f8f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -FROM centos:6.8 +FROM centos:7 RUN yum -y update; yum clean all RUN yum -y install epel-release; yum clean all diff --git a/build_and_run.sh b/build_and_run.sh index 8e7e215..25cb813 100755 --- a/build_and_run.sh +++ b/build_and_run.sh @@ -14,6 +14,6 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -docker rmi epel6-testing -docker build -t epel6-testing . -docker run --rm -t epel6-testing +docker rmi epel7-testing +docker build -t epel7-testing . +docker run --rm -t epel7-testing diff --git a/tests/test_rhbz1369486.py b/tests/test_rhbz1369486.py index 0817bc1..0b8285e 100644 --- a/tests/test_rhbz1369486.py +++ b/tests/test_rhbz1369486.py @@ -33,7 +33,7 @@ class TestPython2Macros: return output def test_python2_version_macro(self, python2_version_macro): - assert python2_version_macro == '2.6\n' + assert python2_version_macro == '2.7\n' def test_python2_version_nodots_macro(self, python2_version_nodots_macro): - assert python2_version_nodots_macro == '26\n' + assert python2_version_nodots_macro == '27\n' -- cgit