summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2013-11-29 14:35:48 +0100
committerMichael Vogt <mvo@debian.org>2013-11-29 14:35:48 +0100
commitfd4e73c33c20873af670ee40b549c46ee0d50801 (patch)
tree6a9e1432a652d5b43cbb3b9fb13bcdef46c46d72
parent572c5fd4dd724240c6780cca37de30db958549a9 (diff)
skip the one test that got broken because the patch from debian #666772 is applied
-rwxr-xr-xtest/integration/test-bug-683786-build-dep-on-virtual-packages10
1 files changed, 7 insertions, 3 deletions
diff --git a/test/integration/test-bug-683786-build-dep-on-virtual-packages b/test/integration/test-bug-683786-build-dep-on-virtual-packages
index 879d6a3bc..c839a0fe6 100755
--- a/test/integration/test-bug-683786-build-dep-on-virtual-packages
+++ b/test/integration/test-bug-683786-build-dep-on-virtual-packages
@@ -41,9 +41,13 @@ The following NEW packages will be installed:
Inst po-debconf (1 unstable, unstable [all])
Conf po-debconf (1 unstable, unstable [all])' aptget build-dep dash -s
-testequal 'Reading package lists...
-Building dependency tree...
-E: Build-Depends dependency for dash cannot be satisfied because the package po-debconf cannot be found' aptget build-dep -aarmel dash -s
+# ubuntu has the patch from
+# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=666772
+# applied so the following test works in the ubuntu/master branch
+#
+#testequal 'Reading package lists...
+#Building dependency tree...
+#E: Build-Depends dependency for dash cannot be satisfied because the package po-debconf cannot be found' aptget build-dep -aarmel dash -s
testequal 'Reading package lists...
Building dependency tree...