tests/tests/quilt: Test series quiltification

diff --git a/tests/tests/quilt b/tests/tests/quilt
index c9a50e9d1bd90cb8af8287359ab4a4941a87c1dd..e11e1ad6bf9d2eda869460d8d9b013186853f277 100755 (executable)
--- a/tests/tests/quilt
+++ b/tests/tests/quilt
@@ -32,6 +32,23 @@ iteration () {
 git cherry-pick -x incoming~1; iteration
 git cherry-pick -x incoming~0; iteration
 
+git fetch $tmp/incoming/$p incoming-branch:branch
+git checkout branch
+git rebase --onto dgit/sid incoming
+git checkout dgit/sid
+git merge branch
+iteration
+
+diff <<END - debian/patches/series
+change-something-in-the-upstream-yml
+spongiform-upstream-new-file-incl-change
+zorkmid-options-=-42
+END
+
+for f in `cat debian/patches/series`; do
+       egrep -q '^Author.*ijackson@chiark' debian/patches/$f
+done
+
 t-822-field ../${p}_${v}_*.changes Changes |
  grep -Fx 'ruby-rails-3.2 (3.2.6-2~dummy1) unstable; urgency=low'
 

diff --git a/tests/worktrees/ruby-rails-3.2_test.tar b/tests/worktrees/ruby-rails-3.2_test.tar
index 8c57662a0c4ff78077a768947029e6134980e6d1..fe01878eafc20a755c6402962bd871229da4d425 100644 (file)
Binary files a/tests/worktrees/ruby-rails-3.2_test.tar and b/tests/worktrees/ruby-rails-3.2_test.tar differ