summaryrefslogtreecommitdiff
path: root/tests/tests/trustingpolicy-replay
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-07-17 15:37:07 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-07-31 22:55:01 +0100
commit8eb4d3531c65dc7afa2bbfe56d535faa756da073 (patch)
tree9f70408170cfc0712d6fee9ea960466668b19391 /tests/tests/trustingpolicy-replay
parent8a178bf100d49ad948f5f3ec5540da1ff9c74c3e (diff)
Tag change: Test suite: Introduce $tagpfx
Currently this is `test-dummy' (the distro the tests work with). Have checked that after this commit find tests -type f | xargs perl -i~ -pe 's/\$tagpfx/test-dummy/g' puts everything back. (This does not prove I have changed the right set of occurrences, but it does suggest that each actual change is good.) No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/tests/trustingpolicy-replay')
-rwxr-xr-xtests/tests/trustingpolicy-replay14
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/tests/trustingpolicy-replay b/tests/tests/trustingpolicy-replay
index 517f98a..8cc205c 100755
--- a/tests/tests/trustingpolicy-replay
+++ b/tests/tests/trustingpolicy-replay
@@ -20,7 +20,7 @@ t-dgit build
t-dgit push
t-rm-dput-dropping
-git checkout test-dummy/1.0
+git checkout $tagpfx/1.0
t-dgit build
t-dgit push --deliberately-fresh-repo
@@ -28,8 +28,8 @@ remote="`git config dgit-distro.test-dummy.git-url`/$p.git"
t-expect-push-fail 'Replay of previously-rewound upload' \
git push "$remote" \
- test-dummy/1.1 \
- test-dummy/1.1~0:refs/dgit/sid
+ $tagpfx/1.1 \
+ $tagpfx/1.1~0:refs/dgit/sid
git checkout master
@@ -57,11 +57,11 @@ prepare-replay () {
attempt-replay () {
local mpat=$1
- git show test-dummy/$replayv | grep -e $delib
+ git show $tagpfx/$replayv | grep -e $delib
t-expect-push-fail "$mpat" \
git push "$remote" \
- test-dummy/$replayv \
- +test-dummy/$replayv~0:refs/dgit/sid
+ $tagpfx/$replayv \
+ +$tagpfx/$replayv~0:refs/dgit/sid
}
prepare-replay --deliberately-fresh-repo
@@ -77,7 +77,7 @@ t-commit 'later version to stop not fast forward rewinding'
t-dgit build
t-dgit push
-attempt-replay "does not declare previously tags/test-dummy/$v"
+attempt-replay "does not declare previously tags/$tagpfx/$v"
echo ok.