summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2013-12-13 16:50:32 (GMT)
committerRichard Maw <richard.maw@codethink.co.uk>2014-01-15 16:24:44 (GMT)
commit623a908220316a8064d3187597b255f5056b1478 (patch)
treec43ef198e6b0a87b3cc6d40d6d14a162fc87b98b
parent848118b07b38a534bd0b53a8d972001a5fb22777 (diff)
downloadmorph-623a908220316a8064d3187597b255f5056b1478.tar.gz
unit tests: Fix invalid morphologies
Later validation work causes the morphologies to be validated, when they weren't previously. This would cause the test suite to not pass, since the morphologies defined in the tests are malformed. One common problem was tests that, instead of a name field, had the name of the morpholgy in a field called "chunk". There were a few cases of new fields being needed, since the tests were written before they became mandatory. The most interesting failure was a Source being created, which instead of being passed a morphology object, was passed a string.
-rw-r--r--morphlib/artifact_tests.py4
-rw-r--r--morphlib/cachekeycomputer_tests.py16
-rw-r--r--morphlib/localartifactcache_tests.py4
-rw-r--r--morphlib/remoteartifactcache_tests.py4
4 files changed, 15 insertions, 13 deletions
diff --git a/morphlib/artifact_tests.py b/morphlib/artifact_tests.py
index 8edbbde..d4b15cb 100644
--- a/morphlib/artifact_tests.py
+++ b/morphlib/artifact_tests.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2013 Codethink Limited
+# Copyright (C) 2012-2014 Codethink Limited
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@ class ArtifactTests(unittest.TestCase):
morph = morphlib.morph2.Morphology(
'''
{
- "chunk": "chunk",
+ "name": "chunk",
"kind": "chunk",
"chunks": {
"chunk-runtime": [
diff --git a/morphlib/cachekeycomputer_tests.py b/morphlib/cachekeycomputer_tests.py
index 2f033a7..4e73e90 100644
--- a/morphlib/cachekeycomputer_tests.py
+++ b/morphlib/cachekeycomputer_tests.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2013 Codethink Limited
+# Copyright (C) 2012-2014 Codethink Limited
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -53,7 +53,8 @@ class CacheKeyComputerTests(unittest.TestCase):
{
"name": "chunk",
"repo": "repo",
- "ref": "original/ref"
+ "ref": "original/ref",
+ "build-depends": []
}
]
}''',
@@ -64,12 +65,14 @@ class CacheKeyComputerTests(unittest.TestCase):
{
"name": "chunk2",
"repo": "repo",
- "ref": "original/ref"
+ "ref": "original/ref",
+ "build-depends": []
},
{
"name": "chunk3",
"repo": "repo",
- "ref": "original/ref"
+ "ref": "original/ref",
+ "build-depends": []
}
]
}''',
@@ -118,7 +121,6 @@ class CacheKeyComputerTests(unittest.TestCase):
for artifact in self.artifacts:
if artifact.name == name:
return artifact
- raise
def test_compute_key_hashes_all_types(self):
runcount = {'thing': 0, 'dict': 0, 'list': 0, 'tuple': 0}
@@ -184,8 +186,8 @@ class CacheKeyComputerTests(unittest.TestCase):
self.assertEqual(old_sha, new_sha)
def test_same_morphology_added_to_source_pool_only_appears_once(self):
- src = morphlib.source.Source('repo', 'original/ref', 'sha', 'tree',
- '{"name": "chunk", "kind": "chunk"}',
+ m = morphlib.morph2.Morphology('{"name": "chunk", "kind": "chunk"}')
+ src = morphlib.source.Source('repo', 'original/ref', 'sha', 'tree', m,
'chunk.morph')
sp = morphlib.sourcepool.SourcePool()
sp.add(src)
diff --git a/morphlib/localartifactcache_tests.py b/morphlib/localartifactcache_tests.py
index d774335..18d2061 100644
--- a/morphlib/localartifactcache_tests.py
+++ b/morphlib/localartifactcache_tests.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2012,2013 Codethink Limited
+# Copyright (C) 2012,2014 Codethink Limited
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -30,7 +30,7 @@ class LocalArtifactCacheTests(unittest.TestCase):
morph = morphlib.morph2.Morphology(
'''
{
- "chunk": "chunk",
+ "name": "chunk",
"kind": "chunk",
"artifacts": {
"chunk-runtime": [
diff --git a/morphlib/remoteartifactcache_tests.py b/morphlib/remoteartifactcache_tests.py
index e7f45f5..d11bf26 100644
--- a/morphlib/remoteartifactcache_tests.py
+++ b/morphlib/remoteartifactcache_tests.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2013 Codethink Limited
+# Copyright (C) 2012-2014 Codethink Limited
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@ class RemoteArtifactCacheTests(unittest.TestCase):
morph = morphlib.morph2.Morphology(
'''
{
- "chunk": "chunk",
+ "name": "chunk",
"kind": "chunk",
"artifacts": {
"chunk-runtime": [