summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rwxr-xr-xtests/tests/gdr-import-dgit26
1 files changed, 17 insertions, 9 deletions
diff --git a/tests/tests/gdr-import-dgit b/tests/tests/gdr-import-dgit
index 2d77d43..8ab8bef 100755
--- a/tests/tests/gdr-import-dgit
+++ b/tests/tests/gdr-import-dgit
@@ -8,15 +8,20 @@ t-setup-import gdr-convert-gbp
cd $p
-: 'non-dgit upload (but we prepare it with dgit anyway)'
-
-git checkout -b nmu
+nmu-upload-1 () {
+ nmubranch=$1
+ git checkout -f -b $nmubranch
+ t-git-debrebase
+ t-git-debrebase convert-to-gbp
+ # now we are on a gbp patched-unapplied branch
+}
-nmu-upload () {
- t-dch-commit -v $v -m nmu
- t-some-changes nmu
+nmu-upload-2 () {
+ gbp pq import
+ t-dch-commit -v $v -m "nmu $nmubranch $v"
+ t-some-changes "nmu $numbranch $v"
t-dch-commit -r sid
t-dgit -wgf build-source
@@ -29,8 +34,11 @@ nmu-upload () {
t-archive-process-incoming sid
}
-v=2.0-2+num1
-nmu-upload
+: 'non-dgit upload (but we prepare it with dgit anyway)'
+
+v=2.0-2+nmu1
+nmu-upload-1 nmu
+nmu-upload-2
: 'done the nmu, switching back to the maintainer hat'
@@ -39,7 +47,7 @@ git checkout master
t-dgit fetch
git merge --ff-only dgit/dgit/sid
-git diff --exit-code nmu
+git diff --exit-code patch-queue/nmu
git branch t.before