git-debrebase: test suite: gdr nmu divergence: do maintainer first

In practical terms this is needed because we are only using one tree,
and otherwise the nmu's dgit push will update dgit/dgit/sid, causing
the ffq check to fail (when we fix it, in a moment).

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/tests/lib-gdr b/tests/lib-gdr
index ac4a476ea3596ba34cd87f85c24b654a8c6d6889..0fc55e3ec09cd8665b34ee148a9b0493aedc220a 100644 (file)
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -204,6 +204,8 @@ t-maintainer-commit-some-changes () {
 }
 
 t-nmu-causes-ff-fail () {
 }
 
 t-nmu-causes-ff-fail () {

+       t-dgit fetch
+

        t-expect-fail E:'Not.*fast-forward' \
        git merge --ff-only dgit/dgit/sid
 }
        t-expect-fail E:'Not.*fast-forward' \
        git merge --ff-only dgit/dgit/sid
 }

diff --git a/tests/tests/gdr-diverge-nmu b/tests/tests/gdr-diverge-nmu
index 8f0b9cb0135780a9de29d4457f0636c613140a1a..9951f5d7a56a574c47656e354fbc7fccaf014875 100755 (executable)
--- a/tests/tests/gdr-diverge-nmu
+++ b/tests/tests/gdr-diverge-nmu
@@ -10,9 +10,17 @@ cd $p
 
 t-dgit setup-mergechangelogs
 
 
 t-dgit setup-mergechangelogs
 

+: 'maintainer'
+
+v=2.0-3
+t-maintainer-commit-some-changes
+
+t-git-next-date
+

 : 'non-dgit upload (but we prepare it with dgit anyway)'
 
 t-git-next-date
 : 'non-dgit upload (but we prepare it with dgit anyway)'
 
 t-git-next-date

+git checkout origin/master

 
 v=2.0-2+nmu1
 t-nmu-upload-1 nmu
 
 v=2.0-2+nmu1
 t-nmu-upload-1 nmu


@@ -21,20 +29,12 @@ t-nmu-upload-2
 t-nmu-commit-an-upstream-change
 t-nmu-upload-3
 
 t-nmu-commit-an-upstream-change
 t-nmu-upload-3
 

-: 'done the nmu, switching back to the maintainer hat'
-
-t-git-next-date
-
-v=2.0-3
-t-maintainer-commit-some-changes
+: 'ad hocery'

 
 

-t-dgit fetch

 t-git-next-date
 t-git-next-date

-
+git checkout master

 t-nmu-causes-ff-fail
 
 t-nmu-causes-ff-fail
 

-: 'ad hocery'
-

 git cherry-pick 'dgit/dgit/sid^{/UPSTREAM NMU}'
 
 t-expect-fail 'Automatic merge failed; fix conflicts' \
 git cherry-pick 'dgit/dgit/sid^{/UPSTREAM NMU}'
 
 t-expect-fail 'Automatic merge failed; fix conflicts' \

diff --git a/tests/tests/gdr-diverge-nmu-dgit b/tests/tests/gdr-diverge-nmu-dgit
index 02fb2f704481763303d55ac89c305ac32c8026cf..bb6a19f40715f678e408bdfc95e00429a9887075 100755 (executable)
--- a/tests/tests/gdr-diverge-nmu-dgit
+++ b/tests/tests/gdr-diverge-nmu-dgit
@@ -10,9 +10,18 @@ cd $p
 
 t-dgit setup-mergechangelogs
 
 
 t-dgit setup-mergechangelogs
 

+: 'maintainer'
+
+git checkout master
+
+v=2.0-3
+t-maintainer-commit-some-changes
+
+t-git-next-date
+

 : 'nmu'
 
 : 'nmu'
 

-git checkout -b nmu
+git checkout -b nmu origin/master~0

 
 t-git-next-date
 
 
 t-git-next-date
 


@@ -25,20 +34,12 @@ t-dgit -wgf push-source
 
 t-archive-process-incoming sid
 
 
 t-archive-process-incoming sid
 

-: 'maintainer'
-
-git checkout master
-
-v=2.0-3
-t-maintainer-commit-some-changes
+: 'rebase nmu onto our branch'

 
 

-t-dgit fetch

 t-git-next-date
 t-git-next-date

-
+git checkout master

 t-nmu-causes-ff-fail
 
 t-nmu-causes-ff-fail
 

-: 'rebase nmu onto our branch'
-

 git checkout dgit/dgit/sid # detach
 
 t-expect-fail 'E:CONFLICT.*Commit Debian 3\.0 \(quilt\) metadata' \
 git checkout dgit/dgit/sid # detach
 
 t-expect-fail 'E:CONFLICT.*Commit Debian 3\.0 \(quilt\) metadata' \