diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-08-13 16:40:37 +0000 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-08-14 16:59:36 +0000 |
| commit | 5374f53985d357255126a917b107ce78ece5941d (patch) | |
| tree | 1ca7fe5a228c1d89a4d8e19f3885bd00966e98ad /tests.branching/tag-tag-works-as-expected.stdout | |
| parent | 1c44afdafb32a803e2578ace2545c2fe36373538 (diff) | |
| download | morph-5374f53985d357255126a917b107ce78ece5941d.tar.gz | |
Fix test suite to patch YAML instead of JSON
I shouldn't be doing this in the middle of refactoring, but trying to
get the new code to emit exactly the right kind of JSON is too much pain,
and these tests need to be rewritten to use YAML in the near future anyway
(we'll drop JSON support eventually), so I don't want to spend more time
on this than necessary.
The changes in this commit convert morphologies in JSON to YAML, and
fix test code that modifies the morphologies to work with the YAML.
There is probably more JSON lurking about.
Diffstat (limited to 'tests.branching/tag-tag-works-as-expected.stdout')
| -rw-r--r-- | tests.branching/tag-tag-works-as-expected.stdout | 51 |
1 files changed, 24 insertions, 27 deletions
diff --git a/tests.branching/tag-tag-works-as-expected.stdout b/tests.branching/tag-tag-works-as-expected.stdout index 4848ee6e..8969cf30 100644 --- a/tests.branching/tag-tag-works-as-expected.stdout +++ b/tests.branching/tag-tag-works-as-expected.stdout @@ -8,44 +8,41 @@ Date: Tue Jul 31 16:51:54 2012 +0000 Second -commit fec3744adf30c1014775dce1668b1b0a0e2b1dcf +commit 6f4900b857108ae696ef90d09417cdf6040353e4 Author: developer <developer@example.com> Date: Tue Jul 31 16:51:54 2012 +0000 Second diff --git a/hello-stratum.morph b/hello-stratum.morph -index 3b7be17..87561c1 100644 +index 53e76f3..d060579 100644 --- a/hello-stratum.morph +++ b/hello-stratum.morph -@@ -5,8 +5,9 @@ - { - "name": "hello", - "repo": "test:hello", -- "ref": "master", -- "build-depends": [] -+ "ref": "f4d032b42c0134e67bdf19a43fa99072493667d7", -+ "build-depends": [], -+ "unpetrify-ref": "master" - } - ] - } +@@ -1,7 +1,8 @@ + chunks: + - build-depends: [] + name: hello +- ref: master ++ ref: 6c7ddb7a9c0c5bf4ee02a8de030f0892a399c6bb + repo: test:hello ++ unpetrify-ref: master + kind: stratum + name: hello-stratum diff --git a/hello-system.morph b/hello-system.morph -index 20e7b5b..f1dc834 100644 +index b0fed3b..875d73a 100644 --- a/hello-system.morph +++ b/hello-system.morph -@@ -8,7 +8,8 @@ - { - "morph": "hello-stratum", - "repo": "test:morphs", -- "ref": "master" -+ "ref": "tagged-tag", -+ "unpetrify-ref": "master" - } - ] - } +@@ -3,6 +3,7 @@ kind: system + name: hello-system + strata: + - morph: hello-stratum +- ref: master ++ ref: tagged-tag + repo: test:morphs ++ unpetrify-ref: master + system-kind: rootfs-tarball test:morphs -commit fec3744adf30c1014775dce1668b1b0a0e2b1dcf +commit 6f4900b857108ae696ef90d09417cdf6040353e4 Author: developer <developer@example.com> AuthorDate: Tue Jul 31 16:51:54 2012 +0000 Commit: developer <developer@example.com> @@ -53,7 +50,7 @@ CommitDate: Tue Jul 31 16:51:54 2012 +0000 Second -commit 9d4b0981d6a2118cbd3d045cc1704b224d38296f +commit 0d291d7caa82fb6535172189f579435471ad6dc6 Author: developer <developer@example.com> AuthorDate: Tue Jul 31 16:51:54 2012 +0000 Commit: developer <developer@example.com> |