summaryrefslogtreecommitdiff
path: root/tests.merging/rename-chunk.script
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2012-11-07 15:51:01 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2012-11-07 18:53:48 +0000
commitb599757873d5f05e82647287dfd1387f2426e5c5 (patch)
tree45813def262ff7d58b0e3c9564670fd0907d9ff7 /tests.merging/rename-chunk.script
parent25067e0ff261577da0ace26126c01e2829d7e5b7 (diff)
downloadmorph-b599757873d5f05e82647287dfd1387f2426e5c5.tar.gz
tests: Use test: URL prefix instead of baserock: throughout
Some tests already used test: and in order to be able to share the scripts/setup-3rd-party-strata script they need to all use the same prefix. Using baserock: implies that we are using real code from Baserock, so I picked test: because the tests only ever use mock morphologies and no real code.
Diffstat (limited to 'tests.merging/rename-chunk.script')
-rwxr-xr-xtests.merging/rename-chunk.script10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests.merging/rename-chunk.script b/tests.merging/rename-chunk.script
index 06969b70..fb76491b 100755
--- a/tests.merging/rename-chunk.script
+++ b/tests.merging/rename-chunk.script
@@ -28,11 +28,11 @@ fi
# Create system branch.
cd "$DATADIR/workspace"
"$SRCDIR/scripts/test-morph" init
-"$SRCDIR/scripts/test-morph" branch baserock:morphs baserock/newbranch
+"$SRCDIR/scripts/test-morph" branch test:morphs baserock/newbranch
# Rename the chunk, and then commit a seperate change
"$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello
-cd baserock/newbranch/baserock:hello
+cd baserock/newbranch/test:hello
cat hello.morph | sed -e 's/"name": "hello"/"name": "goodbye"/' > goodbye.morph
git rm -q hello.morph
@@ -44,19 +44,19 @@ git add newfile.txt
git commit -m "Add new file" --quiet
# Update stratum to point at the renamed chunk
-cd ../baserock:morphs
+cd ../test:morphs
sed -ie 's/"name": "hello"/"name": "goodbye"/' hello-stratum.morph
git commit --all --quiet -m "Update morph refs for baserock/newbranch"
# Merge changes back to master
cd "$DATADIR/workspace"
-"$SRCDIR/scripts/test-morph" checkout baserock:morphs master
+"$SRCDIR/scripts/test-morph" checkout test:morphs master
cd master
"$SRCDIR/scripts/test-morph" merge baserock/newbranch
# Morph should have realised that 'goodbye' is not a new chunk,
# and pulled in the changes from 'hello' in the old branch
-cd baserock:hello
+cd test:hello
[ ! -e hello.morph ]
[ -e goodbye.morph ]
[ -e newfile.txt ]