r26281 - in /trunk/libpoe-perl/debian: changelog patches/honour_no_network_option.patch patches/series rules

[rmayorga-guest at users.alioth.debian.org]

Author: rmayorga-guest
Date: Mon Oct 27 19:22:34 2008
New Revision: 26281

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=26281
Log:
+ Fixing workaround to run tests that require network access
+ honour_no_network_option.patch added to skip some tests that 
  require network access

Added:
    trunk/libpoe-perl/debian/patches/honour_no_network_option.patch
Modified:
    trunk/libpoe-perl/debian/changelog
    trunk/libpoe-perl/debian/patches/series
    trunk/libpoe-perl/debian/rules

Modified: trunk/libpoe-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpoe-perl/debian/changelog?rev=26281&op=diff
==============================================================================
--- trunk/libpoe-perl/debian/changelog (original)
+++ trunk/libpoe-perl/debian/changelog Mon Oct 27 19:22:34 2008
@@ -1,10 +1,4 @@
 libpoe-perl (2:1.0030-1) UNRELEASED; urgency=low
-
-  PROBLEM:
-  the network check in debian/rules doesn't work (Makefile.PL doesn't care
-  about it) but I think it would be a good idea anyway. maybe play around with
-  run_network_tests instead?
-  -- gregoa
   
   [ gregor herrmann ]
   * Add debian/README.source to document quilt usage, as required by
@@ -21,7 +15,11 @@
     + add myself to uploaders
   * debian/rules
     + convert to dh7 using dh-make-perl
+    + change the workaround to manage network availability
   * remove the local copy of xvfb-run is not needed
+  * debian/patches/honour_no_network_option.patch 
+    + skip  t/90_regression/agaran-filter-httpd.t if 
+    no network is available
 
  -- Rene Mayorga <rmayorga at debian.org.sv>  Sat, 25 Oct 2008 22:24:44 -0600
 

Added: trunk/libpoe-perl/debian/patches/honour_no_network_option.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpoe-perl/debian/patches/honour_no_network_option.patch?rev=26281&op=file
==============================================================================
--- trunk/libpoe-perl/debian/patches/honour_no_network_option.patch (added)
+++ trunk/libpoe-perl/debian/patches/honour_no_network_option.patch Mon Oct 27 19:22:34 2008
@@ -1,0 +1,13 @@
+--- libpoe-perl.orig/t/90_regression/agaran-filter-httpd.t
++++ libpoe-perl/t/90_regression/agaran-filter-httpd.t
+@@ -6,6 +6,10 @@
+ use strict;
+ 
+ BEGIN {
++  unless (-f 'run_network_tests') {
++	  print "1..0 # skip - Network access (and permission) required to run this test\n";
++	  exit;
++  }
+   eval "use HTTP::Request";
+   if ($@) {
+     print "1..0 # skip - HTTP::Request needed to test POE::Filter::HTTPD\n";

Modified: trunk/libpoe-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpoe-perl/debian/patches/series?rev=26281&op=diff
==============================================================================
--- trunk/libpoe-perl/debian/patches/series (original)
+++ trunk/libpoe-perl/debian/patches/series Mon Oct 27 19:22:34 2008
@@ -1,1 +1,2 @@
 makefile_dont_use_defaults.patch
+honour_no_network_option.patch

Modified: trunk/libpoe-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpoe-perl/debian/rules?rev=26281&op=diff
==============================================================================
--- trunk/libpoe-perl/debian/rules (original)
+++ trunk/libpoe-perl/debian/rules Mon Oct 27 19:22:34 2008
@@ -7,10 +7,11 @@
 build: build-stamp
 build-stamp: $(QUILT_STAMPFN)
 	dh build --before dh_auto_configure
-	# Run network tests only if localhost is reachable, the perl snippet prints
-	# "n" when reachable.
-	$(PERL) -MNet::Ping -e 'print (Net::Ping->new()->ping("127.0.0.1", 1) ? \
-		"n" : "y", "\n");' | $(PERL) Makefile.PL INSTALLDIRS=vendor
+	# Run network tests only if localhost is reachable, the perl snippet touch
+	# run_network_tests if the loopback interface is available.
+	echo "\n" | $(PERL) Makefile.PL INSTALLDIRS=vendor
+	$(PERL) -MNet::Ping -e '(Net::Ping->new()->ping("127.0.0.1", 1)) ? \
+	        system("touch run_network_tests") : system("rm -rf run_network_tests");'
 	dh build --after dh_auto_configure
 	touch $@