diff options
| author | Clark Boylan <clark.boylan@gmail.com> | 2014-08-21 14:40:19 -0700 |
|---|---|---|
| committer | Clark Boylan <clark.boylan@gmail.com> | 2014-08-21 14:40:19 -0700 |
| commit | 2532dd65c853b9874f9647f6f085a1a3808cb88b (patch) | |
| tree | 170e7dfb61f804adf5cf8319f2748697da5bca4c | |
| parent | 2de0c2a37a8d52a09d1375e374deeec52fea38bf (diff) | |
| download | zuul-2532dd65c853b9874f9647f6f085a1a3808cb88b.tar.gz | |
Handle random PYTHONHASHSEED values.
Voluptions does a depth first in order traversal of the data structures
it is checking and fails fast. This means it will die when it hits the
first error and return only that error. The test_layouts test is
checking that different bad layout files fail in unique ways. This check
breaks when the python hashseed is random resulting in different depth
first traversals which can result in returning the same error twice if
bad layout files have common errors.
Fix this by trimming down the errors in each layout file to a single
error this way the order of the errors hit never matters.
Fix a string typo in test_layouts while we are in there.
Change-Id: Ie7587ebac4d22063a6819c68011f7fb67a49fcc0
| -rw-r--r-- | tests/fixtures/layouts/bad_pipelines1.yaml | 2 | ||||
| -rw-r--r-- | tests/fixtures/layouts/bad_template3.yaml | 3 | ||||
| -rw-r--r-- | tests/test_layoutvalidator.py | 2 |
3 files changed, 1 insertions, 6 deletions
diff --git a/tests/fixtures/layouts/bad_pipelines1.yaml b/tests/fixtures/layouts/bad_pipelines1.yaml index 4207a2c2a..da909333c 100644 --- a/tests/fixtures/layouts/bad_pipelines1.yaml +++ b/tests/fixtures/layouts/bad_pipelines1.yaml @@ -1,4 +1,2 @@ pipelines: -projects: - - name: foo diff --git a/tests/fixtures/layouts/bad_template3.yaml b/tests/fixtures/layouts/bad_template3.yaml index 70412b86d..54697c462 100644 --- a/tests/fixtures/layouts/bad_template3.yaml +++ b/tests/fixtures/layouts/bad_template3.yaml @@ -1,8 +1,5 @@ # Template refers to an unexisting pipeline -pipelines: - # We have no pipelines at all - project-templates: - name: template-generic unexisting-pipeline: # pipeline does not exist diff --git a/tests/test_layoutvalidator.py b/tests/test_layoutvalidator.py index 7e9f1d5aa..5a8fc4622 100644 --- a/tests/test_layoutvalidator.py +++ b/tests/test_layoutvalidator.py @@ -57,7 +57,7 @@ class TestLayoutValidator(testtools.TestCase): error = str(e) print ' ', error if error in errors: - raise Exception("Error has already beed tested: %s" % + raise Exception("Error has already been tested: %s" % error) else: errors.append(error) |