r14787 - in /trunk/libflickr-api-perl/debian: changelog patches/00-fix427318-jun3-07.test.pl.patch patches/00-test-no-internet.patch rules

[ntyni at users.alioth.debian.org]

Author: ntyni
Date: Tue Feb 12 13:12:30 2008
New Revision: 14787

URL: http://svn.debian.org/wsvn/?sc=1&rev=14787
Log:
* debian/patches/test-no-internet: really disable all internet connections
                                   in the test suite. (Closes: #465431)

Added:
    trunk/libflickr-api-perl/debian/patches/00-test-no-internet.patch
Removed:
    trunk/libflickr-api-perl/debian/patches/00-fix427318-jun3-07.test.pl.patch
Modified:
    trunk/libflickr-api-perl/debian/changelog
    trunk/libflickr-api-perl/debian/rules

Modified: trunk/libflickr-api-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libflickr-api-perl/debian/changelog?rev=14787&op=diff
==============================================================================
--- trunk/libflickr-api-perl/debian/changelog (original)
+++ trunk/libflickr-api-perl/debian/changelog Tue Feb 12 13:12:30 2008
@@ -1,7 +1,4 @@
 libflickr-api-perl (0.09-1) UNRELEASED; urgency=low
-
-  * TODO:
-    + make the tests not connect to flickr.com at all (drop them?) !
 
   [ Damyan Ivanov ]
   * debian/control: Added: Vcs-Svn field (source stanza); Vcs-Browser
@@ -24,6 +21,8 @@
 
   [ Niko Tyni ]
   * Depend on libwww-perl and liburi-perl, recommend libcompress-zlib-perl
+  * debian/patches/test-no-internet: really disable all internet connections
+                                     in the test suite. (Closes: #465431)
 
  -- Martín Ferrari <martin.ferrari at gmail.com>  Mon, 11 Feb 2008 08:53:46 -0200
 

Added: trunk/libflickr-api-perl/debian/patches/00-test-no-internet.patch
URL: http://svn.debian.org/wsvn/trunk/libflickr-api-perl/debian/patches/00-test-no-internet.patch?rev=14787&op=file
==============================================================================
--- trunk/libflickr-api-perl/debian/patches/00-test-no-internet.patch (added)
+++ trunk/libflickr-api-perl/debian/patches/00-test-no-internet.patch Tue Feb 12 13:12:30 2008
@@ -1,0 +1,21 @@
+--- libflickr-api-perl.orig/test.pl
++++ libflickr-api-perl/test.pl
+@@ -13,6 +13,9 @@
+ 		'key' => 'made_up_key',
+ 		'secret' => 'my_secret',
+ 	});
++
++SKIP: {
++skip("No internet connections during Debian builds", 2) if ($ENV{DEBIAN_BUILD});
+ my $rsp = $api->execute_method('fake.method', {});
+ 
+ 
+@@ -34,7 +37,7 @@
+ 
+ $rsp = $api->execute_method('flickr.test.echo', {format => 'fake'});
+ is($rsp->{error_code}, 111, 'checking the error code for "format not found"');
+-
++} # SKIP
+ 
+ ##################################################
+ #

Modified: trunk/libflickr-api-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libflickr-api-perl/debian/rules?rev=14787&op=diff
==============================================================================
--- trunk/libflickr-api-perl/debian/rules (original)
+++ trunk/libflickr-api-perl/debian/rules Tue Feb 12 13:12:30 2008
@@ -4,6 +4,9 @@
 include /usr/share/cdbs/1/class/perlmodule.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
+# set DEBIAN_BUILD so test.pl will skip network connections
+DEB_MAKE_CHECK_TARGET=test DEBIAN_BUILD=1
+
 install/libflickr-api-perl::
 	[ ! -d debian/libflickr-api-perl/usr/lib/perl5 ] || \
 		rmdir --ignore-fail-on-non-empty --parents --verbose \