From 88169a03d4b1f865f2f5ca3adf2855c791435b17 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 8 Jul 2018 18:37:56 +0100 Subject: test suite: gdr-convert-gbp: drop --overwrite With #903132 properly fixed, this is no longer needed. Signed-off-by: Ian Jackson --- tests/setup/gdr-convert-gbp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/setup/gdr-convert-gbp') diff --git a/tests/setup/gdr-convert-gbp b/tests/setup/gdr-convert-gbp index e523fd3..8049d87 100755 --- a/tests/setup/gdr-convert-gbp +++ b/tests/setup/gdr-convert-gbp @@ -86,7 +86,7 @@ v=2.0-2 t-dch-commit -v $v -m 'switch to git-debrebase, no other changes' t-dch-commit -r sid -$ifarchive t-dgit -wgf push-source --new --overwrite +$ifarchive t-dgit -wgf push-source --new git push cd .. -- cgit v1.2.3 From a47f1af332372a372bf5758d1e3d9eeffe14acbd Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 12 Jul 2018 12:37:45 +0100 Subject: test suite: Factor out t-dch-commit-r The pattern `dch -r sid' is actually wrong and we will want to change it. See #903441 and #903598. For future-proofing, factor this out before we fix it. Signed-off-by: Ian Jackson --- tests/setup/gdr-convert-gbp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/setup/gdr-convert-gbp') diff --git a/tests/setup/gdr-convert-gbp b/tests/setup/gdr-convert-gbp index 8049d87..d64b867 100755 --- a/tests/setup/gdr-convert-gbp +++ b/tests/setup/gdr-convert-gbp @@ -64,7 +64,7 @@ gbp import-orig --upstream-version=2.0 ../$ust not-gdr-processable t-dch-commit -v 2.0-1 -m 'new upstream (did gbp import-orig)' -t-dch-commit -r sid +t-dch-commit-r $ifarchive t-archive-none $p $ifarchive t-git-none @@ -84,7 +84,7 @@ t-git-debrebase -fupstream-has-debian convert-from-gbp v=2.0-2 t-dch-commit -v $v -m 'switch to git-debrebase, no other changes' -t-dch-commit -r sid +t-dch-commit-r $ifarchive t-dgit -wgf push-source --new git push -- cgit v1.2.3 From 0871c116c21e7f91f5ec5a0810daca1eeba21dd5 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 12 Jul 2018 13:27:19 +0100 Subject: test suite: Drop t-ok from setup/* t-ok is going to save artifacts, which we don't want these to do. It is not actually needed. All it does that is useful is the fsck, which the actual tests will do. Signed-off-by: Ian Jackson --- tests/setup/gdr-convert-gbp | 2 -- 1 file changed, 2 deletions(-) (limited to 'tests/setup/gdr-convert-gbp') diff --git a/tests/setup/gdr-convert-gbp b/tests/setup/gdr-convert-gbp index d64b867..6ec374d 100755 --- a/tests/setup/gdr-convert-gbp +++ b/tests/setup/gdr-convert-gbp @@ -99,5 +99,3 @@ t-setup-done '' "$(echo $p*) salsa $($ifarchive echo git mirror aq)" ' p=example t-git-next-date ' - -t-ok -- cgit v1.2.3