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/edit-updates-stratum.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/edit-updates-stratum.stdout')
| -rw-r--r-- | tests.branching/edit-updates-stratum.stdout | 47 |
1 files changed, 27 insertions, 20 deletions
diff --git a/tests.branching/edit-updates-stratum.stdout b/tests.branching/edit-updates-stratum.stdout index e53588b4..2a4f3fd1 100644 --- a/tests.branching/edit-updates-stratum.stdout +++ b/tests.branching/edit-updates-stratum.stdout @@ -1,26 +1,33 @@ diff --git a/hello-stratum.morph b/hello-stratum.morph -index 3b7be17..febfa60 100644 +index 53e76f3..8417659 100644 --- a/hello-stratum.morph +++ b/hello-stratum.morph -@@ -5,7 +5,7 @@ - { - "name": "hello", - "repo": "test:hello", -- "ref": "master", -+ "ref": "newbranch", - "build-depends": [] - } - ] +@@ -1,7 +1,10 @@ ++build-depends: [] + chunks: + - build-depends: [] ++ morph: hello + name: hello +- ref: master ++ ref: newbranch + repo: test:hello ++description: '' + kind: stratum + name: hello-stratum diff --git a/hello-system.morph b/hello-system.morph -index 20e7b5b..a259572 100644 +index b0fed3b..b1417ce 100644 --- a/hello-system.morph +++ b/hello-system.morph -@@ -8,7 +8,7 @@ - { - "morph": "hello-stratum", - "repo": "test:morphs", -- "ref": "master" -+ "ref": "newbranch" - } - ] - } +@@ -1,8 +1,11 @@ + arch: x86_64 ++configuration-extensions: [] ++description: '' ++disk-size: 1G + kind: system + name: hello-system + strata: + - morph: hello-stratum +- ref: master ++ ref: newbranch + repo: test:morphs + system-kind: rootfs-tarball |