[SCM] Debian package checker branch, lab-refactor, updated. 2.5.3-89-gd0b3117
The following commit has been merged in the lab-refactor branch:
commit 30f339e91da84be96b5ec8e3ed261b378fc2f608
Author: Niels Thykier <niels@thykier.net>
Date: Thu Sep 29 21:13:31 2011 +0200
Fixed test failures related to the changes renaming
This makes a couple of post_test/sed snippets redundant. :)
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/t/tests/distribution-multiple-bad/post_test b/t/tests/distribution-multiple-bad/post_test
deleted file mode 100644
index c671e1a..0000000
--- a/t/tests/distribution-multiple-bad/post_test
+++ /dev/null
@@ -1 +0,0 @@
-s/_[^ _]* changes/_arch changes/
diff --git a/t/tests/distribution-multiple-bad/tags b/t/tests/distribution-multiple-bad/tags
index 350c358..9dfa4ed 100644
--- a/t/tests/distribution-multiple-bad/tags
+++ b/t/tests/distribution-multiple-bad/tags
@@ -1,4 +1,4 @@
-E: distribution-multiple-bad_1.0_arch changes: bad-distribution-in-changes-file bar
-E: distribution-multiple-bad_1.0_arch changes: bad-distribution-in-changes-file foo
-E: distribution-multiple-bad_1.0_arch changes: bad-distribution-in-changes-file foo-backportss
-E: distribution-multiple-bad_1.0_arch changes: multiple-distributions-in-changes-file stable foo-backportss bar foo
+E: distribution-multiple-bad changes: bad-distribution-in-changes-file bar
+E: distribution-multiple-bad changes: bad-distribution-in-changes-file foo
+E: distribution-multiple-bad changes: bad-distribution-in-changes-file foo-backportss
+E: distribution-multiple-bad changes: multiple-distributions-in-changes-file stable foo-backportss bar foo
diff --git a/t/tests/generic-empty/post_test b/t/tests/generic-empty/post_test
deleted file mode 100644
index c671e1a..0000000
--- a/t/tests/generic-empty/post_test
+++ /dev/null
@@ -1 +0,0 @@
-s/_[^ _]* changes/_arch changes/
diff --git a/t/tests/generic-empty/tags b/t/tests/generic-empty/tags
index 179dab8..b04062d 100644
--- a/t/tests/generic-empty/tags
+++ b/t/tests/generic-empty/tags
@@ -1,3 +1,6 @@
+E: generic-empty changes: bad-urgency-in-changes-file unknown
+E: generic-empty changes: changed-by-address-malformed a <>
+E: generic-empty changes: changed-by-address-missing a <>
E: generic-empty source: debian-rules-missing-required-target binary-arch
E: generic-empty source: debian-rules-missing-required-target binary-indep
E: generic-empty source: maintainer-address-missing a
@@ -5,9 +8,6 @@ E: generic-empty source: no-standards-version-field
E: generic-empty: maintainer-address-missing a
E: generic-empty: no-copyright-file
E: generic-empty: package-has-no-description
-E: generic-empty_1.0_arch changes: bad-urgency-in-changes-file unknown
-E: generic-empty_1.0_arch changes: changed-by-address-malformed a <>
-E: generic-empty_1.0_arch changes: changed-by-address-missing a <>
W: generic-empty source: changelog-should-mention-nmu
W: generic-empty source: debian-rules-missing-recommended-target build-arch
W: generic-empty source: debian-rules-missing-recommended-target build-indep
diff --git a/t/tests/lintian-output-xml/post_test b/t/tests/lintian-output-xml/post_test
deleted file mode 100644
index f86ebec..0000000
--- a/t/tests/lintian-output-xml/post_test
+++ /dev/null
@@ -1 +0,0 @@
-s/(lintian-output-xml)_([^_]+)_([^"]+)/\1_\2_ARCH/
diff --git a/t/tests/lintian-output-xml/tags b/t/tests/lintian-output-xml/tags
index 89c58bd..cdce805 100644
--- a/t/tests/lintian-output-xml/tags
+++ b/t/tests/lintian-output-xml/tags
@@ -2,7 +2,7 @@
</package>
</package>
<package type="binary" name="lintian-output-xml" architecture="all" version="1.0+dsfg-1.1">
-<package type="changes" name="lintian-output-xml_1.0+dsfg-1.1_ARCH" architecture="source all" version="1.0+dsfg-1.1">
+<package type="changes" name="lintian-output-xml" architecture="source all" version="1.0+dsfg-1.1">
<package type="source" name="lintian-output-xml" architecture="source" version="1.0+dsfg-1.1">
<tag severity="important" certainty="possible" name="new-essential-package" />
<tag severity="minor" certainty="certain" flags="overridden" name="dfsg-version-misspelled">1.0+dsfg-1.1</tag>
diff --git a/testset/tags.foo++ b/testset/tags.foo++
index a0d70b0..f2eb407 100644
--- a/testset/tags.foo++
+++ b/testset/tags.foo++
@@ -1,3 +1,4 @@
+E: foo++ changes: changed-by-address-malformed Marc 'HE' Brockschmidt <he@unknown>
E: foo++ source: build-info-in-binary-control-file-section Package foo++
E: foo++ source: debian-control-file-uses-obsolete-national-encoding at line 19
E: foo++ source: malformed-dm-upload-allowed no
@@ -13,7 +14,6 @@ E: foo++: debian-changelog-file-contains-invalid-email-address he@unknown
E: foo++: debian-changelog-file-uses-obsolete-national-encoding at line 11
E: foo++: no-copyright-file
E: foo++: wrong-debian-qa-address-set-as-maintainer Lintian Maintainer <debian-qa@lists.debian.org>
-E: foo++_5_arch changes: changed-by-address-malformed Marc 'HE' Brockschmidt <he@unknown>
I: foo++ source: duplicate-short-description foo++ foo++-helper
I: foo++ source: missing-debian-source-format
I: foo++: no-md5sums-control-file
diff --git a/testset/tags.foo++.sed b/testset/tags.foo++.sed
deleted file mode 100644
index c671e1a..0000000
--- a/testset/tags.foo++.sed
+++ /dev/null
@@ -1 +0,0 @@
-s/_[^ _]* changes/_arch changes/
diff --git a/testset/tags.scripts b/testset/tags.scripts
index 3a0e0de..b07ad46 100644
--- a/testset/tags.scripts
+++ b/testset/tags.scripts
@@ -1,3 +1,4 @@
+E: scripts changes: bad-ubuntu-distribution-in-changes-file unstable
E: scripts source: dpatch-index-references-non-existent-patch 01_not_here_right_now.dpatch
E: scripts source: dpatch-index-references-non-existent-patch 01_some_other_patch_thats_not_in_the_package.dpatch
E: scripts source: missing-build-dependency debhelper
@@ -18,7 +19,6 @@ E: scripts: python-script-but-no-python-dep usr/bin/pyfoo
E: scripts: shell-script-fails-syntax-check usr/bin/sh-broken
E: scripts: wrong-path-for-interpreter usr/bin/lefty-foo (#!/usr/local/bin/lefty != /usr/bin/lefty)
E: scripts: wrong-path-for-interpreter usr/bin/rubyfoo (#!/bin/ruby1.8 != /usr/bin/ruby1.8)
-E: scripts_6ds-1ubuntu0.5.10.1_arch changes: bad-ubuntu-distribution-in-changes-file unstable
I: scripts source: debian-watch-file-should-dversionmangle-not-uversionmangle line 5
I: scripts source: dpatch-missing-description 02_i_dont_have_a_description.patch
I: scripts source: dpatch-missing-description 04_i_dont_have_a_description_either.patch
diff --git a/testset/tags.scripts.sed b/testset/tags.scripts.sed
deleted file mode 100644
index c671e1a..0000000
--- a/testset/tags.scripts.sed
+++ /dev/null
@@ -1 +0,0 @@
-s/_[^ _]* changes/_arch changes/
--
Debian package checker
Reply to: