diff options
| -rw-r--r-- | tests/test_build.py | 31 | ||||
| -rw-r--r-- | tox.ini | 6 |
2 files changed, 10 insertions, 27 deletions
diff --git a/tests/test_build.py b/tests/test_build.py index f4d917e9b..a58327a51 100644 --- a/tests/test_build.py +++ b/tests/test_build.py @@ -63,39 +63,22 @@ class BuildTest(base.BaseTestCase): self.assertEqual(failures, 0, "%d failure(s) occurred" % failures) -class BuildTestCentosBinaryDocker(BuildTest): +class BuildTestCentosBinary(BuildTest): def setUp(self): - super(BuildTestCentosBinaryDocker, self).setUp() + super(BuildTestCentosBinary, self).setUp() self.build_args.extend(["--base", "centos", "--type", "binary"]) -class BuildTestCentosSourceDocker(BuildTest): +class BuildTestCentosSource(BuildTest): def setUp(self): - super(BuildTestCentosSourceDocker, self).setUp() + super(BuildTestCentosSource, self).setUp() self.build_args.extend(["--base", "centos", "--type", "source"]) -class BuildTestCentosBinaryTemplate(BuildTest): +class BuildTestUbuntuSource(BuildTest): def setUp(self): - super(BuildTestCentosBinaryTemplate, self).setUp() - self.build_args.extend(["--base", "centos", - "--type", "binary", - "--template"]) - - -class BuildTestCentosSourceTemplate(BuildTest): - def setUp(self): - super(BuildTestCentosSourceTemplate, self).setUp() - self.build_args.extend(["--base", "centos", - "--type", "source", - "--template"]) - - -class BuildTestUbuntuSourceTemplate(BuildTest): - def setUp(self): - super(BuildTestUbuntuSourceTemplate, self).setUp() + super(BuildTestUbuntuSource, self).setUp() self.build_args.extend(["--base", "ubuntu", - "--type", "source", - "--template"]) + "--type", "source"]) @@ -40,7 +40,7 @@ whitelist_externals = find commands = find . -type f -name "*.pyc" -delete bash -c "if [ ! -d .testrepository ]; then testr init; fi" - sudo -g docker testr run test_build.BuildTestCentosBinaryTemplate + sudo -g docker testr run test_build.BuildTestCentosBinary # deprecated [testenv:images-centos-source] @@ -50,7 +50,7 @@ whitelist_externals = find commands = find . -type f -name "*.pyc" -delete bash -c "if [ ! -d .testrepository ]; then testr init; fi" - sudo -g docker testr run test_build.BuildTestCentosSourceTemplate + sudo -g docker testr run test_build.BuildTestCentosSource [testenv:images-ubuntu-source] whitelist_externals = find @@ -59,7 +59,7 @@ whitelist_externals = find commands = find . -type f -name "*.pyc" -delete bash -c "if [ ! -d .testrepository ]; then testr init; fi" - sudo -g docker testr run test_build.BuildTestUbuntuSourceTemplate + sudo -g docker testr run test_build.BuildTestUbuntuSource [testenv:images-centos-binary-docker] whitelist_externals = find |