The following commit has been merged in the master branch:
commit fc372437a25080989c6ab788fe0382ef508739a4
Author: Martin Packman <[email protected]>
Date: Wed Dec 21 10:14:27 2011 +0100
dpkg-mergechangelogs: supplementary non-regression test
Add a test that ensures that dpkg-mergechangelogs deals correctly
with invalid versions.
Signed-off-by: Raphaël Hertzog <[email protected]>
diff --git a/scripts/t/910_merge_changelogs.t b/scripts/t/910_merge_changelogs.t
index a3c0509..79951a9 100644
--- a/scripts/t/910_merge_changelogs.t
+++ b/scripts/t/910_merge_changelogs.t
@@ -22,7 +22,7 @@ use File::Temp qw(tempfile);
use strict;
use warnings;
-plan tests => 2;
+plan tests => 3;
my $srcdir = $ENV{srcdir} || '.';
my $datadir = "$srcdir/t/910_merge_changelogs";
@@ -32,7 +32,8 @@ sub test_merge {
my ($expected_file, @options) = @_;
my ($fh, $filename) = tempfile();
spawn(exec => ["$srcdir/dpkg-mergechangelogs.pl", @options],
- to_handle => $fh, wait_child => 1, nocheck => 1);
+ to_handle => $fh, error_to_file => "/dev/null",
+ wait_child => 1, nocheck => 1);
my $res = compare($expected_file, $filename);
if ($res) {
system("diff -u $expected_file $filename >&2");
@@ -55,3 +56,5 @@ if ($has_alg_merge) {
test_merge("$datadir/ch-merged-basic", @input);
test_merge("$datadir/ch-merged-pr-basic", "-m", @input);
}
+test_merge("$datadir/ch-badver-merged", ("$datadir/ch-badver-old",
+ "$datadir/ch-badver-a", "$datadir/ch-badver-b"));
diff --git a/scripts/t/910_merge_changelogs/ch-badver-a
b/scripts/t/910_merge_changelogs/ch-badver-a
new file mode 100644
index 0000000..d544e64
--- /dev/null
+++ b/scripts/t/910_merge_changelogs/ch-badver-a
@@ -0,0 +1,5 @@
+egcs (ss-970814-1) experimental; urgency=low
+
+ * Initial packaging (of initial snapshot!)
+
+ -- Galen Hazelwood <[email protected]> Wed, 20 Aug 1997 00:36:28 +0000
diff --git a/scripts/t/910_merge_changelogs/ch-badver-b
b/scripts/t/910_merge_changelogs/ch-badver-b
new file mode 100644
index 0000000..609254e
--- /dev/null
+++ b/scripts/t/910_merge_changelogs/ch-badver-b
@@ -0,0 +1,11 @@
+egcs (970904-1) experimental; urgency=low
+
+ * New upstream snapshot
+
+ -- Galen Hazelwood <[email protected]> Sun, 7 Sep 1997 18:25:06 -0600
+
+egcs (ss-970814-1) experimental; urgency=low
+
+ * Initial packaging (of initial snapshot!)
+
+ -- Galen Hazelwood <[email protected]> Wed, 20 Aug 1997 00:36:28 +0000
diff --git a/scripts/t/910_merge_changelogs/ch-badver-merged
b/scripts/t/910_merge_changelogs/ch-badver-merged
new file mode 100644
index 0000000..609254e
--- /dev/null
+++ b/scripts/t/910_merge_changelogs/ch-badver-merged
@@ -0,0 +1,11 @@
+egcs (970904-1) experimental; urgency=low
+
+ * New upstream snapshot
+
+ -- Galen Hazelwood <[email protected]> Sun, 7 Sep 1997 18:25:06 -0600
+
+egcs (ss-970814-1) experimental; urgency=low
+
+ * Initial packaging (of initial snapshot!)
+
+ -- Galen Hazelwood <[email protected]> Wed, 20 Aug 1997 00:36:28 +0000
diff --git a/scripts/t/910_merge_changelogs/ch-badver-old
b/scripts/t/910_merge_changelogs/ch-badver-old
new file mode 100644
index 0000000..d544e64
--- /dev/null
+++ b/scripts/t/910_merge_changelogs/ch-badver-old
@@ -0,0 +1,5 @@
+egcs (ss-970814-1) experimental; urgency=low
+
+ * Initial packaging (of initial snapshot!)
+
+ -- Galen Hazelwood <[email protected]> Wed, 20 Aug 1997 00:36:28 +0000
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
