From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 19 Jan 2014 15:04:00 +0000 (+0000)
Subject: dgit-repos-server: wip tests
X-Git-Tag: debian/0.22~94
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=44a2c13511958d2dec9de240fbbcc1102869b9a8

dgit-repos-server: wip tests
---

diff --git a/dgit b/dgit
index 61a1f730..50c45d7a 100755
--- a/dgit
+++ b/dgit
@@ -470,14 +470,6 @@ our %defcfg = ('dgit.default.distro' => 'debian',
 	       'dgit-distro.test-dummy.archive-query' => "dummycat:$td/aq",
 	       'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
 	       'dgit-distro.test-dummy.upload-host' => 'test-dummy',
-	       'dgit-distro.test-dummy-drs.ssh' => "$td/ssh",
-	       'dgit-distro.test-dummy-drs.username' => "alice",
-	       'dgit-distro.test-dummy-drs.git-check' => "true",
-	       'dgit-distro.test-dummy-drs.git-create' => "true",
-	       'dgit-distro.test-dummy-drs.git-url' => "$td/git",
-	       'dgit-distro.test-dummy-drs.archive-query' => "dummycat:$td/aq",
-	       'dgit-distro.test-dummy-drs.mirror' => "file://$td/mirror/",
-	       'dgit-distro.test-dummy-drs.upload-host' => 'test-dummy',
                );
 
 sub cfg {
diff --git a/dgit-repos-server b/dgit-repos-server
index e6b2dfbb..cbbfe1ea 100644
--- a/dgit-repos-server
+++ b/dgit-repos-server
@@ -1,10 +1,10 @@
 #!/usr/bin/perl -w
-# dgit-repos-push-receiver
+# dgit-repos-server
 #
 # usages:
-#  .../dgit-repos-push-receiver SUITES KEYRING-AUTH-SPEC DGIT-REPOS-DIR --ssh
+#  .../dgit-repos-server SUITES KEYRING-AUTH-SPEC DGIT-REPOS-DIR --ssh
 # internal usage:
-#  .../dgit-repos-push-receiver --pre-receive-hook PACKAGE
+#  .../dgit-repos-server --pre-receive-hook PACKAGE
 #
 # Invoked as the ssh restricted command
 #
diff --git a/tests/drs-git-ext b/tests/drs-git-ext
new file mode 100755
index 00000000..f66384a7
--- /dev/null
+++ b/tests/drs-git-ext
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+troot=$DGIT_TEST_TROOT
+tmp=$DGIT_TEST_TMP
+
+set -x
+export SSH_ORIGINAL_COMMAND="$*"
+${DGIT_REPOS_SERVER_TEST-dgit-repos-server} \
+	$tmp/suites \
+	$tmp/dd.gpg,a:$tmp/dm.gpg,m$tmp/dm.txt \
+	$troot/git \
+	--sssh
diff --git a/tests/drs-sshd b/tests/drs-sshd
deleted file mode 100755
index d8b8d916..00000000
--- a/tests/drs-sshd
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-${DGIT_REPOS_SERVER_TEST-dgit-repos-server}   xxx wip
diff --git a/tests/lib b/tests/lib
index b80989d6..3dc46d64 100644
--- a/tests/lib
+++ b/tests/lib
@@ -84,7 +84,7 @@ t-archive () {
 t-dgit () {
 	: '{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
 	${DGIT_TEST-dgit} --dget:-u --dput:--config=$tmp/dput.cf \
-		-dtest-dummy -D -k39B13D8A "$@"
+		-dtest-dummy $DGIT_TEST_OPTS -D -k39B13D8A "$@"
 	: '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}'
 }
 
diff --git a/tests/tests/drs-newpackage b/tests/tests/drs-newpackage
new file mode 100755
index 00000000..a6d2d0d6
--- /dev/null
+++ b/tests/tests/drs-newpackage
@@ -0,0 +1,27 @@
+#!/bin/bash
+set -e
+. tests/lib
+
+export DGIT_TEST_TROOT=$troot
+export DGIT_TEST_TMP=$tmp
+export DGIT_TEST_OPTS="
+    -cdgit-distro.test-dummy.git-url=ext::$troot/drs-git-ext
+"
+
+t-archive-none pari-extra
+t-git-none
+t-worktree 3-1
+v=3-1
+cd $p
+git branch -m dgit/sid master
+git remote rm dgit
+
+t-refs-same-start
+t-ref-head
+
+t-dgit build
+t-dgit push --new
+
+t-pushed-good master
+
+echo ok.