diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2013-08-29 11:48:50 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2013-08-30 10:34:53 +0000 |
| commit | 2beadc4d94bd77e1794832c758b6174ff1ada0a6 (patch) | |
| tree | a4edb67ad6a7158517ad230acedba12cb9b27bac /tests.branching/edit-updates-stratum.stdout | |
| parent | b0096f15bb3624207b1df71b22070b4780b03658 (diff) | |
| download | morph-2beadc4d94bd77e1794832c758b6174ff1ada0a6.tar.gz | |
edit: Unset defaults before writing
This also amends the test suite.
The git apply command to alter the stratum proved inflexible when
anything changed, so it has been replaced by a small in-line python
script.
Diffstat (limited to 'tests.branching/edit-updates-stratum.stdout')
| -rw-r--r-- | tests.branching/edit-updates-stratum.stdout | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/tests.branching/edit-updates-stratum.stdout b/tests.branching/edit-updates-stratum.stdout index f6a1587c..e84dbe09 100644 --- a/tests.branching/edit-updates-stratum.stdout +++ b/tests.branching/edit-updates-stratum.stdout @@ -1,34 +1,25 @@ diff --git a/hello-stratum.morph b/hello-stratum.morph -index 73ed482..b3f27b4 100644 +index 73ed482..3731d63 100644 --- a/hello-stratum.morph +++ b/hello-stratum.morph -@@ -1,8 +1,11 @@ -+build-depends: [] - chunks: +@@ -2,7 +2,7 @@ chunks: - build-depends: [] build-mode: test -+ 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 b0fed3b..b1417ce 100644 +index b0fed3b..801a955 100644 --- a/hello-system.morph +++ b/hello-system.morph -@@ -1,8 +1,11 @@ - arch: x86_64 -+configuration-extensions: [] -+description: '' -+disk-size: 1G - kind: system +@@ -3,6 +3,5 @@ kind: system name: hello-system strata: - morph: hello-stratum - ref: master + ref: newbranch repo: test:morphs - system-kind: rootfs-tarball +-system-kind: rootfs-tarball |