[pyfai] 10/22: skip test requiring network

[Frédéric-Emmanuel Picca]

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

picca pushed a commit to annotated tag debian/0.12.0+dfsg-1
in repository pyfai.

commit ef4f79983aca5c73b4f77a8aa32f586ba357aff9
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Tue Jun 7 16:37:04 2016 +0200

    skip test requiring network
---
 debian/patches/0002-skip-test-if-no-network.patch | 41 +++++++++++++++++++++++
 debian/patches/series                             |  1 +
 2 files changed, 42 insertions(+)

diff --git a/debian/patches/0002-skip-test-if-no-network.patch b/debian/patches/0002-skip-test-if-no-network.patch
new file mode 100644
index 0000000..92f5ce4
--- /dev/null
+++ b/debian/patches/0002-skip-test-if-no-network.patch
@@ -0,0 +1,41 @@
+From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?=
+ <picca at synchrotron-soleil.fr>
+Date: Tue, 7 Jun 2016 16:36:35 +0200
+Subject: skip test if no network
+
+---
+ pyFAI/test/utilstest.py | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/pyFAI/test/utilstest.py b/pyFAI/test/utilstest.py
+index 812a311..ef9ee09 100644
+--- a/pyFAI/test/utilstest.py
++++ b/pyFAI/test/utilstest.py
+@@ -50,9 +50,9 @@ import distutils.util
+ import unittest
+ import logging
+ try:  # Python3
+-    from urllib.request import urlopen, ProxyHandler, build_opener
++    from urllib.request import urlopen, ProxyHandler, build_opener, URLError
+ except ImportError:  # Python2
+-    from urllib2 import urlopen, ProxyHandler, build_opener
++    from urllib2 import urlopen, ProxyHandler, build_opener, URLError
+ # import urllib2
+ import numpy
+ import shutil
+@@ -185,9 +185,12 @@ class UtilsTest(object):
+                 opener = urlopen
+ 
+             logger.info("wget %s/%s" % (cls.url_base, imagename))
+-            data = opener("%s/%s" % (cls.url_base, imagename),
+-                          data=None, timeout=cls.timeout).read()
+-            logger.info("Image %s successfully downloaded." % imagename)
++            try:
++                data = opener("%s/%s" % (cls.url_base, imagename),
++                              data=None, timeout=cls.timeout).read()
++                logger.info("Image %s successfully downloaded." % imagename)
++            except URLError:
++                unittest.SkipTest("network unreachable.")
+ 
+             try:
+                 with open(fullimagename, "wb") as outfile:
diff --git a/debian/patches/series b/debian/patches/series
index c33acb0..e34e02a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-remove-useless-logic-in-conf.py.patch
+0002-skip-test-if-no-network.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pyfai.git