aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-08-14 16:48:01 +0000
committerGerrit Code Review <review@openstack.org>2015-08-14 16:48:02 +0000
commitdf54c15145da51ee73b8024116a1fdc1abb8b874 (patch)
tree8b702592d5e5ce4dc406bab4396009fc539c00ee
parentb8a12f725da78762065c4455ef3eeeb9cd04b778 (diff)
parentf33f5913a3a8756679b98f70aa8a3a5719cd2bfe (diff)
downloadkolla-df54c15145da51ee73b8024116a1fdc1abb8b874.tar.gz
kolla-df54c15145da51ee73b8024116a1fdc1abb8b874.zip
Merge "Use inheritance for overriding of builder args"
-rw-r--r--tests/test_build.py37
1 files changed, 34 insertions, 3 deletions
diff --git a/tests/test_build.py b/tests/test_build.py
index 0bfaad275..03a15e6c4 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -30,10 +30,11 @@ class BuildTest(base.BaseTestCase):
super(BuildTest, self).setUp()
self.useFixture(log_fixture.SetLogLevel([__name__],
logging.logging.INFO))
+ self.build_args = [__name__, "--debug"]
- def test_build(self):
- build_args = ["--debug"]
- with patch.object(sys, 'argv', build_args):
+ def runTest(self):
+ with patch.object(sys, 'argv', self.build_args):
+ LOG.info("Running with args %s" % self.build_args)
bad_results, good_results = build.main()
# these are images that are known to not build properly
@@ -57,3 +58,33 @@ class BuildTest(base.BaseTestCase):
LOG.critical(">>> Expected image '%s' to succeed!" % image)
self.assertEqual(failures, 0, "%d failure(s) occurred" % failures)
+
+
+class BuildTestCentosBinary(BuildTest):
+ def setUp(self):
+ super(BuildTestCentosBinary, self).setUp()
+ self.build_args.extend(["--base", "centos",
+ "--type", "binary"])
+
+
+class BuildTestTemplateCentosBinary(BuildTest):
+ def setUp(self):
+ super(BuildTestCentosBinary, self).setUp()
+ self.build_args.extend(["--base", "centos",
+ "--type", "binary",
+ "--template"])
+
+
+class BuildTestCentosSource(BuildTest):
+ def setUp(self):
+ super(BuildTestCentosSource, self).setUp()
+ self.build_args.extend(["--base", "centos",
+ "--type", "source"])
+
+
+class BuildTestTemplateCentosSource(BuildTest):
+ def setUp(self):
+ super(BuildTestCentosSource, self).setUp()
+ self.build_args.extend(["--base", "centos",
+ "--type", "source",
+ "--template"])