[Python-modules-commits] r25773 - in packages/python-gnupg/trunk/debian (2 files)

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

    Date: Friday, September 6, 2013 @ 09:58:11
  Author: mitya57-guest
Revision: 25773

Skip more tests that require network connection. Closes: #721965.

Modified:
  packages/python-gnupg/trunk/debian/changelog
  packages/python-gnupg/trunk/debian/patches/skip_network_needing_test.patch

Modified: packages/python-gnupg/trunk/debian/changelog
===================================================================
--- packages/python-gnupg/trunk/debian/changelog	2013-09-06 02:31:51 UTC (rev 25772)
+++ packages/python-gnupg/trunk/debian/changelog	2013-09-06 09:58:11 UTC (rev 25773)
@@ -1,3 +1,9 @@
+python-gnupg (0.3.5-2) UNRELEASED; urgency=low
+
+  * Skip more tests that require network connection. Closes: #721965.
+
+ -- Dmitry Shachnev <mitya57 at gmail.com>  Fri, 06 Sep 2013 13:45:56 +0400
+
 python-gnupg (0.3.5-1) unstable; urgency=low
 
   * New upstream release. Closes: #721296, #721294.

Modified: packages/python-gnupg/trunk/debian/patches/skip_network_needing_test.patch
===================================================================
--- packages/python-gnupg/trunk/debian/patches/skip_network_needing_test.patch	2013-09-06 02:31:51 UTC (rev 25772)
+++ packages/python-gnupg/trunk/debian/patches/skip_network_needing_test.patch	2013-09-06 09:58:11 UTC (rev 25773)
@@ -1,9 +1,9 @@
-Description: Skip a doctest snippet that requires internet access
+Description: Skip tests that require internet access
 Forwarded: not-needed
 Author: Elena Grandi <elena.valhalla at gmail.com>
 --- a/gnupg.py
 +++ b/gnupg.py
-@@ -863,8 +863,8 @@
+@@ -948,8 +948,8 @@
          >>> shutil.rmtree("keys")
          >>> gpg = GPG(gnupghome="keys")
          >>> os.chmod('keys', 0x1C0)
@@ -11,6 +11,32 @@
 -        >>> assert result
 +        >>> result = gpg.recv_keys('keyserver.ubuntu.com', '92905378')  # doctest: +SKIP
 +        >>> assert result  # doctest: +SKIP
-
+ 
          """
          result = self.result_map['import'](self)
+@@ -1067,11 +1067,11 @@
+         >>> shutil.rmtree('keys')
+         >>> gpg = GPG(gnupghome='keys')
+         >>> os.chmod('keys', 0x1C0)
+-        >>> result = gpg.search_keys('<vinay_sajip at hotmail.com>')
+-        >>> assert result
++        >>> result = gpg.search_keys('<vinay_sajip at hotmail.com>')  # doctest: +SKIP
++        >>> assert result  # doctest: +SKIP
+         >>> keyserver = 'keyserver.ubuntu.com'
+-        >>> result = gpg.search_keys('<vinay_sajip at hotmail.com>', keyserver)
+-        >>> assert result
++        >>> result = gpg.search_keys('<vinay_sajip at hotmail.com>', keyserver)  # doctest: +SKIP
++        >>> assert result  # doctest: +SKIP
+ 
+         """
+ 
+--- a/test_gnupg.py
++++ b/test_gnupg.py
+@@ -452,6 +452,7 @@
+                     os.remove(fn)
+         logger.debug("test_file_encryption_and_decryption ends")
+ 
++    @unittest.skip('requires network')
+     def test_search_keys(self):
+         "Test that searching for keys works"
+         r = self.gpg.search_keys('<vinay_sajip at hotmail.com>')