[SCM] branch, master, updated. debian/0.45-1-31-g6d29a24

Harlan Lieberman-Berg H.LiebermanBerg at gmail.com
Mon Jun 3 19:58:55 UTC 2013


The following commit has been merged in the master branch:
commit 21e95cc9fc041008d06831d5252a6d397c759707
Author: Harlan Lieberman-Berg <H.LiebermanBerg at gmail.com>
Date:   Mon Jun 3 15:56:54 2013 -0400

    Pull in patch from upstream to fix broken test.

diff --git a/debian/patches/fix-broken-test.patch b/debian/patches/fix-broken-test.patch
new file mode 100644
index 0000000..e6845cb
--- /dev/null
+++ b/debian/patches/fix-broken-test.patch
@@ -0,0 +1,28 @@
+From: Ken Williams <kwilliams at cpan.org>
+Subject: [PATCH] Fix a test failure when connecting to db version v2.4.3
+Origin: https://github.com/mongodb/mongo-perl-driver/commit/e836c19861acf6308bfd9b971c604789bbfd1069
+Bug: https://jira.mongodb.org/browse/PERL-226
+Reviewed-by: Harlan Lieberman-Berg <H.LiebermanBerg at gmail.com>
+Applied-Upstream: 0.700.1
+
+Apparently the error message has changed.
+---
+ t/db.t | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/t/db.t b/t/db.t
+index 3b2f7ff..1610e11 100644
+--- a/t/db.t
++++ b/t/db.t
+@@ -43,7 +43,7 @@ my $hello = $db->eval('function(x) { return "hello, "+x; }', ["world"]);
+ is('hello, world', $hello, 'db eval');
+ 
+ my $err = $db->eval('function(x) { xreturn "hello, "+x; }', ["world"]);
+-like($err, qr/compile failed/, 'js err');
++like($err, qr/(?:compile|execution) failed/, 'js err');
+ 
+ # tie
+ {
+-- 
+1.8.1.6
+

-- 




More information about the Pkg-perl-cvs-commits mailing list