summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2017-01-13 17:36:07 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2017-01-13 18:29:08 +0000
commitf88a394fc73b9ee570cc7b96ad87903294d0f612 (patch)
tree5b5b63c67f3e6baa4ee4ad5a7ca2ae008e2122c5
parent6f766ed1ce65cd3ece33a12cd76afbfdf412a1b6 (diff)
test suite: defdistro-import-dsc: Drop this test.
import-dsc *should* access the default distro for cmd-dgit et al. (Many of the things in parseopts_late_defaults.) Checking that we use the right distro config is going to be done shortly by protocol-compat. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rw-r--r--debian/changelog1
-rw-r--r--debian/tests/control2
-rwxr-xr-xtests/tests/defdistro-import-dsc4
3 files changed, 2 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index 1ff7529..ecd15f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ dgit (3.3~) unstable; urgency=medium
Test suite:
* Move default dsc distro config setting to lib. We need this
for the .dscs we have in tests/pkg-srcs/.
+ * test suite: defdistro-import-dsc: Drop this test.
--
diff --git a/debian/tests/control b/debian/tests/control
index dca04cc..2ba4183 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -25,7 +25,7 @@ Tests-Directory: tests/tests
Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential
Restrictions: x-dgit-git-only
-Tests: absurd-gitapply badcommit-rewrite build-modes build-modes-asplit build-modes-gbp-asplit clone-clogsigpipe clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject debpolicy-quilt-gbp defdistro-import-dsc defdistro-rpush distropatches-reject drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast gbp-orig gitconfig import-dsc import-native import-nonnative import-tarbomb inarchivecopy mismatches-contents mismatches-dscchanges multisuite newtag-clone-nogit oldnewtagalt oldtag-clone-nogit orig-include-exclude orig-include-exclude-chkquery overwrite-chkclog overwrite-junk overwrite-splitbrains overwrite-version protocol-compat push-buildproductsdir push-newpackage push-nextdgit quilt quilt-gbp quilt-gbp-build-modes quilt-singlepatch quilt-splitbrains rpush tag-updates test-list-uptodate trustingpolicy-replay unrepresentable version-opt
+Tests: absurd-gitapply badcommit-rewrite build-modes build-modes-asplit build-modes-gbp-asplit clone-clogsigpipe clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject debpolicy-quilt-gbp defdistro-rpush distropatches-reject drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast gbp-orig gitconfig import-dsc import-native import-nonnative import-tarbomb inarchivecopy mismatches-contents mismatches-dscchanges multisuite newtag-clone-nogit oldnewtagalt oldtag-clone-nogit orig-include-exclude orig-include-exclude-chkquery overwrite-chkclog overwrite-junk overwrite-splitbrains overwrite-version protocol-compat push-buildproductsdir push-newpackage push-nextdgit quilt quilt-gbp quilt-gbp-build-modes quilt-singlepatch quilt-splitbrains rpush tag-updates test-list-uptodate trustingpolicy-replay unrepresentable version-opt
Tests-Directory: tests/tests
Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential
diff --git a/tests/tests/defdistro-import-dsc b/tests/tests/defdistro-import-dsc
deleted file mode 100755
index 915f9d3..0000000
--- a/tests/tests/defdistro-import-dsc
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -e
-. tests/lib
-t-alt-test