From e8e7f63662e64967c2bf0a1c191859c1b4337f1f Mon Sep 17 00:00:00 2001 From: Devan Goodwin Date: Fri, 8 May 2015 13:05:38 -0300 Subject: [PATCH] Restore F20 Python 3 docker tests. --- hacking/runtests.sh | 2 +- hacking/titotest-fedora-20/Dockerfile | 5 +++++ test/functional/singleproject_tests.py | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/hacking/runtests.sh b/hacking/runtests.sh index bf306fb..1a3629e 100755 --- a/hacking/runtests.sh +++ b/hacking/runtests.sh @@ -67,9 +67,9 @@ titotest-fedora-20 titotest-centos-6 ' -#titotest-fedora-20 #titotest-fedora-rawhide python3_distros=' +titotest-fedora-20 ' rm -f /tmp/titotest*.out &> /dev/null diff --git a/hacking/titotest-fedora-20/Dockerfile b/hacking/titotest-fedora-20/Dockerfile index aa6418e..a1f78dc 100644 --- a/hacking/titotest-fedora-20/Dockerfile +++ b/hacking/titotest-fedora-20/Dockerfile @@ -19,6 +19,11 @@ RUN yum -y install \ python-nose \ python-pep8 +RUN yum -y install \ + python3-mock \ + python3-nose \ + python3-pep8 + RUN yum-builddep -y /tmp/tito.spec RUN yum clean all diff --git a/test/functional/singleproject_tests.py b/test/functional/singleproject_tests.py index ce48835..e2fc197 100644 --- a/test/functional/singleproject_tests.py +++ b/test/functional/singleproject_tests.py @@ -18,7 +18,7 @@ from tito.builder import * from tito.release import Releaser from tito.compat import getoutput from functional.fixture import TitoGitTestFixture, tito -from ConfigParser import RawConfigParser +from tito.compat import RawConfigParser PKG_NAME = "titotestpkg"