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/add-then-edit.script | |
| 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/add-then-edit.script')
| -rwxr-xr-x | tests.branching/add-then-edit.script | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/tests.branching/add-then-edit.script b/tests.branching/add-then-edit.script index 40ee7161..d6a2270f 100755 --- a/tests.branching/add-then-edit.script +++ b/tests.branching/add-then-edit.script @@ -37,19 +37,17 @@ diff --git a/hello-stratum.morph b/hello-stratum.morph index 3b7be17..c79a9af 100644 --- a/hello-stratum.morph +++ b/hello-stratum.morph -@@ -7,6 +7,12 @@ - "repo": "test:hello", - "ref": "master", - "build-depends": [] -+ }, -+ { -+ "name": "goodbye", -+ "repo": "test:goodbye", -+ "ref": "master", -+ "build-depends": [] - } - ] - } +@@ -5,6 +5,10 @@ + name: hello + ref: master + repo: test:hello ++- build-depends: [] ++ name: goodbye ++ ref: master ++ repo: test:goodbye + description: '' + kind: stratum + name: hello-stratum EOF "$SRCDIR/scripts/test-morph" edit hello-system hello-stratum goodbye |