diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-11-07 15:51:01 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-11-07 18:53:48 +0000 |
| commit | b599757873d5f05e82647287dfd1387f2426e5c5 (patch) | |
| tree | 45813def262ff7d58b0e3c9564670fd0907d9ff7 /tests.branching/branch-fails-if-branch-exists.script | |
| parent | 25067e0ff261577da0ace26126c01e2829d7e5b7 (diff) | |
| download | morph-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.branching/branch-fails-if-branch-exists.script')
| -rwxr-xr-x | tests.branching/branch-fails-if-branch-exists.script | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests.branching/branch-fails-if-branch-exists.script b/tests.branching/branch-fails-if-branch-exists.script index c9a18633..1ae92d30 100755 --- a/tests.branching/branch-fails-if-branch-exists.script +++ b/tests.branching/branch-fails-if-branch-exists.script @@ -28,11 +28,11 @@ cd "$DATADIR/workspace" # We create a valid branch inside the same prefix first so we can check it # doesn't get caught up in the deletion of the invalid branch directory -"$SRCDIR/scripts/test-morph" branch baserock:morphs baserock/new-branch +"$SRCDIR/scripts/test-morph" branch test:morphs baserock/new-branch [ -d "$DATADIR/workspace/baserock/new-branch" ] -"$SRCDIR/scripts/test-morph" branch baserock:morphs \ +"$SRCDIR/scripts/test-morph" branch test:morphs \ baserock/existing-branch || true [ -d "$DATADIR/workspace/baserock/new-branch" ] |