This is an automated email from the git hooks/post-receive script.

ntyni pushed a commit to branch master
in repository libtest-expect-perl.

commit 7a267339c53e90b884fcf437a0668c547bfdcacb
Author: Niko Tyni <nt...@debian.org>
Date:   Fri Dec 11 14:03:41 2015 +0200

    Patch the test suite to fix nondeterministic failures.
    
    Closes: #807613
---
 ...ipts-not-to-treat-their-argument-as-a-fil.patch | 44 ++++++++++++++++++++++
 ...002-Read-out-the-buffer-after-expect_send.patch | 38 +++++++++++++++++++
 debian/patches/series                              |  2 +
 3 files changed, 84 insertions(+)

diff --git 
a/debian/patches/0001-Fix-testscripts-not-to-treat-their-argument-as-a-fil.patch
 
b/debian/patches/0001-Fix-testscripts-not-to-treat-their-argument-as-a-fil.patch
new file mode 100644
index 0000000..cebf780
--- /dev/null
+++ 
b/debian/patches/0001-Fix-testscripts-not-to-treat-their-argument-as-a-fil.patch
@@ -0,0 +1,44 @@
+From fea85ee39e17b9be3445b0e819ea0e472d3e8793 Mon Sep 17 00:00:00 2001
+From: Niko Tyni <nt...@debian.org>
+Date: Thu, 10 Dec 2015 22:29:57 +0200
+Subject: [PATCH 1/2] Fix testscripts not to treat their argument as a file
+
+The argument is intended to be the name of the peer,
+not a file to be read.
+
+Bug: https://rt.cpan.org/Public/Bug/Display.html?id=110276
+Bug-Debian: https://bugs.debian.org/807613
+---
+ read     | 2 +-
+ readline | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/read b/read
+index 56252cc..6eb6a34 100644
+--- a/read
++++ b/read
+@@ -3,7 +3,7 @@ use strict;
+ use warnings;
+ $| = 1;
+ 
+-my $what = $ARGV[0] || "there";
++my $what = (shift @ARGV) || "there";
+ print "* Hi $what, to read\n";
+ 
+ while (1) {
+diff --git a/readline b/readline
+index df5665c..4445981 100644
+--- a/readline
++++ b/readline
+@@ -3,7 +3,7 @@ use strict;
+ use warnings;
+ use Term::ReadLine;
+ 
+-my $what = $ARGV[0] || "there";
++my $what = (shift @ARGV) || "there";
+ print "* Hi $what, to readline\n";
+ 
+ my $term = Term::ReadLine->new('readline');
+-- 
+2.6.2
+
diff --git a/debian/patches/0002-Read-out-the-buffer-after-expect_send.patch 
b/debian/patches/0002-Read-out-the-buffer-after-expect_send.patch
new file mode 100644
index 0000000..8ea4466
--- /dev/null
+++ b/debian/patches/0002-Read-out-the-buffer-after-expect_send.patch
@@ -0,0 +1,38 @@
+From 4618dc34719a9f1a40a28836854c934b14b1fc73 Mon Sep 17 00:00:00 2001
+From: Niko Tyni <nt...@debian.org>
+Date: Thu, 10 Dec 2015 22:32:06 +0200
+Subject: [PATCH 2/2] Read out the buffer after expect_send
+
+This and the previous commit fix nondeterministic test failures
+where output from the previous expect_send and stderr from
+the argument handling can make the response vary.
+
+Bug: https://rt.cpan.org/Public/Bug/Display.html?id=110276
+Bug-Debian: https://bugs.debian.org/807613
+---
+ t/simple.t | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/t/simple.t b/t/simple.t
+index 841dda4..4217207 100644
+--- a/t/simple.t
++++ b/t/simple.t
+@@ -3,7 +3,7 @@ use strict;
+ use warnings;
+ use lib 'lib';
+ use Test::Expect;
+-use Test::More tests => 18;
++use Test::More tests => 20;
+ 
+ require_ok('Expect');
+ 
+@@ -20,5 +20,6 @@ foreach my $filename ('read', 'readline') {
+   expect_like(qr/Hi world, to $filename/, "expect_like");
+   expect_is("* Hi world, to $filename", "expect_is");
+   expect_send("ping", "expect_send");
++  expect_is("pong", "expect_is again");
+   expect("ping", "pong", "expect");
+ };
+-- 
+2.6.2
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..1f01ceb
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+0001-Fix-testscripts-not-to-treat-their-argument-as-a-fil.patch
+0002-Read-out-the-buffer-after-expect_send.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-perl/packages/libtest-expect-perl.git

_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits

Reply via email to