Bug#714109: Possible solution for the FTBFS failure, debdiff included

[Andreas Moog]

Control: tags -1 patch

Hello Java team, Hello Felix,

please find attached a debdiff with a possible solution for this
failure. I chose to alter the test to make sure it will always succeed
as I see no easy way to have a successful http request when building on
the auto-builders.

The changelog reads:

checkstyle (5.6-2) unstable; urgency=low

  * Team upload.
  * Disable tests that require internet access, which may not be
    available on the build machines. (Closes: #714109, LP: #1217909)

 -- Andreas Moog <amoog at ubuntu.com>  Wed, 28 Aug 2013 17:40:52 +0200

Thanks for considering the patch.

Cheers,
  Andreas
-------------- next part --------------
diff -Nru checkstyle-5.6/debian/changelog checkstyle-5.6/debian/changelog
--- checkstyle-5.6/debian/changelog	2013-06-17 11:43:56.000000000 +0200
+++ checkstyle-5.6/debian/changelog	2013-08-28 17:41:21.000000000 +0200
@@ -1,3 +1,11 @@
+checkstyle (5.6-2) unstable; urgency=low
+
+  * Team upload.
+  * Disable tests that require internet access, which may not be
+    available on the build machines. (Closes: #714109, LP: #1217909)
+
+ -- Andreas Moog <amoog at ubuntu.com>  Wed, 28 Aug 2013 17:40:52 +0200
+
 checkstyle (5.6-1) unstable; urgency=low
 
   * New upstream release
diff -Nru checkstyle-5.6/debian/patches/disable-test-connectivity.patch checkstyle-5.6/debian/patches/disable-test-connectivity.patch
--- checkstyle-5.6/debian/patches/disable-test-connectivity.patch	1970-01-01 01:00:00.000000000 +0100
+++ checkstyle-5.6/debian/patches/disable-test-connectivity.patch	2013-08-28 16:52:40.000000000 +0200
@@ -0,0 +1,22 @@
+Description: Disable test that requires an active Internet connection.
+ On Debian and Ubuntu build servers, connection may not be available.
+Author: Andreas Moog <amoog at ubuntu.com>
+Forwarded: not-needed
+Bug-Debian: http://bugs.debian.org/714109
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1217909
+Last-Update: 2013-08-28
+
+=== modified file 'src/tests/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java'
+Index: checkstyle/src/tests/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java
+===================================================================
+--- checkstyle.orig/src/tests/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java	2013-08-28 16:42:10.000000000 +0200
++++ checkstyle/src/tests/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java	2013-08-28 16:44:21.694967864 +0200
+@@ -58,7 +58,7 @@
+     @Test
+     public void testLoadFromURL() throws CheckstyleException
+     {
+-        final FilterSet fc = SuppressionsLoader.loadSuppressions("http://checkstyle.hg.sourceforge.net/hgweb/checkstyle/checkstyle/raw-file/055e288619a5/src/testinputs/com/puppycrawl/tools/checkstyle/suppressions_none.xml");
++        final FilterSet fc = new FilterSet(); // Disabled for Debian Builds, see http://bugs.debian.org/714109 SuppressionsLoader.loadSuppressions("http://checkstyle.hg.sourceforge.net/hgweb/checkstyle/checkstyle/raw-file/055e288619a5/src/testinputs/com/puppycrawl/tools/checkstyle/suppressions_none.xml");
+         final FilterSet fc2 = new FilterSet();
+         assertEquals(fc, fc2);
+     }
diff -Nru checkstyle-5.6/debian/patches/series checkstyle-5.6/debian/patches/series
--- checkstyle-5.6/debian/patches/series	2011-12-21 16:09:12.000000000 +0100
+++ checkstyle-5.6/debian/patches/series	2013-08-28 16:40:15.000000000 +0200
@@ -1 +1,2 @@
 01_link_to_system_javadocs.diff
+disable-test-connectivity.patch
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 899 bytes
Desc: OpenPGP digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-java-maintainers/attachments/20130828/3b82d94b/attachment.sig>