aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorSam Yaple <sam@yaple.net>2015-08-25 15:26:47 +0000
committerSam Yaple <sam@yaple.net>2015-08-27 08:56:49 +0000
commitaada29b4dbf65eae105a59389813e96418e33bf5 (patch)
tree2765da29ee643d85d2c6ff2055e4cc1a210680e9 /tests
parenteecf6581a47745d53298c4efa5af6c411afa6260 (diff)
downloadkolla-aada29b4dbf65eae105a59389813e96418e33bf5.tar.gz
kolla-aada29b4dbf65eae105a59389813e96418e33bf5.zip
Remove tiered building in build.py
Many tiers have been shed over this issue and frankly enough is enough on this tiering thing, it's tiering us apart! Now we use threading a bit better as well. No more tiers! Puns very much intended. Additionally, this refactors the function names to make inc0 happier and be consistent. We also modify the test_build.py to catch the new statuses introduced by the regex patch. Then we remove the Ubuntu Source from the Docker folder test as that will never ever be functional. Also fixed regex to properly match true regex expressions. Co-Authored-By: Michal Jastrzebski (inc0) <michal.jastrzebski@intel.com> Change-Id: I650fd6af76eddb809756762222e66aefd6fc1dca Partially-Implements: blueprint build-script
Diffstat (limited to 'tests')
-rw-r--r--tests/test_build.py13
1 files changed, 5 insertions, 8 deletions
diff --git a/tests/test_build.py b/tests/test_build.py
index 125c62540..6d86c8b7c 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -35,7 +35,7 @@ class BuildTest(base.BaseTestCase):
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()
+ bad_results, good_results, unmatched_results = build.main()
# these are images that are known to not build properly
excluded_images = ["gnocchi-api",
@@ -56,6 +56,10 @@ class BuildTest(base.BaseTestCase):
failures = failures + 1
LOG.critical(">>> Expected image '%s' to succeed!" % image)
+ for image in unmatched_results.keys():
+ failures = failures + 1
+ LOG.critical(">>> Expected image '%s' to be matched!" % image)
+
self.assertEqual(failures, 0, "%d failure(s) occurred" % failures)
@@ -73,13 +77,6 @@ class BuildTestCentosSourceDocker(BuildTest):
"--type", "source"])
-class BuildTestUbuntuSourceDocker(BuildTest):
- def setUp(self):
- super(BuildTestUbuntuSourceDocker, self).setUp()
- self.build_args.extend(["--base", "ubuntu",
- "--type", "source"])
-
-
class BuildTestCentosBinaryTemplate(BuildTest):
def setUp(self):
super(BuildTestCentosBinaryTemplate, self).setUp()