dgit: Test suite: quilt-gbp test: More

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

diff --git a/tests/tests/quilt-gbp b/tests/tests/quilt-gbp
index b3e9534323f5928ee5a8fe9ca67d2e32bbc04b1a..271ea2c71c1b34ab9064c57fdfd104e963795db2 100755 (executable)
--- a/tests/tests/quilt-gbp
+++ b/tests/tests/quilt-gbp
@@ -2,6 +2,8 @@
 set -e
 . tests/lib
 
 set -e
 . tests/lib
 

+t-tstunt-parsechangelog
+

 t-gbp-example-prep
 
 t-expect-fail 'quilt fixup cannot be linear' \
 t-gbp-example-prep
 
 t-expect-fail 'quilt fixup cannot be linear' \


@@ -23,28 +25,36 @@ t-dgit --quilt=gbp --clean=git build-source
 t-expect-fail 'specifies a different tree to your HEAD commit' \
   t-dgit push
 
 t-expect-fail 'specifies a different tree to your HEAD commit' \
   t-dgit push
 

+t-refs-same-start
+t-ref-head
+

 t-dgit --quilt=gbp push
 
 t-dgit --quilt=gbp push
 

+t-ref-head
+

 exit 0
 
 ===
 
 want to
 
 exit 0
 
 ===
 
 want to
 

- t-pushed-good XXX need to do something more subtle than check our branch is in repo now
-
- check that
-   - we didn't update caller's branch
-
- do fetch
- check that this didn't update dgit remote ref
-
- check that Dgit hash in dsc refers to tree identical
- to dpkg-source -x
-
- check that that tree
-  - has patches applied (reuse rules build magic)
-  - has .gitignore edited
+ t-pushed-good XXX need to do something more subtle than check our branch is in repo now:
+
+    # check that:
+    # working tree is still clean
+    # DEP-14 tag refers to our HEAD, unchanged
+    # New dgit tag refers to a descendant
+    # New dgit tag and archive tag and .dsc hash are same
+    # dgit tree can be made by
+    #    - dpkg-source -x on the pushed .dsc
+    #    - modulo .pc
+    # Maintainer tree can be made by
+    #    - dpkg-source -x --skip-patches on the pushed .dsc
+    #    - deleting any auto-gitignore patch and removing it from series
+    #    - modulo .pc
+    # dgit tree can be made by
+    #    - as above, and then dpkg-source --before-build
+    #    - modulo .pc and non-debian/ .gitignores

 
 make a new change
 
 
 make a new change