[python-osmapi] 05/06: Drop offline-tests.patch, fixed upstream.

Bas Couwenberg sebastic at debian.org
Thu Sep 7 14:08:55 UTC 2017


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

sebastic pushed a commit to branch master
in repository python-osmapi.

commit 4a6846652f2661ca3c723f0955f8bfee0cd4e266
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Sep 7 16:00:24 2017 +0200

    Drop offline-tests.patch, fixed upstream.
---
 debian/changelog                   |  1 +
 debian/patches/offline-tests.patch | 24 ------------------------
 debian/patches/series              |  1 -
 debian/rules                       |  2 +-
 4 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fa8a462..848632a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ python-osmapi (1.0.2-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Drop python{,3}-httpretty build dependencies.
+  * Drop offline-tests.patch, fixed upstream.
 
  -- Bas Couwenberg <sebastic at debian.org>  Thu, 07 Sep 2017 15:58:41 +0200
 
diff --git a/debian/patches/offline-tests.patch b/debian/patches/offline-tests.patch
deleted file mode 100644
index 9ec0806..0000000
--- a/debian/patches/offline-tests.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Skip tests when OFFLINE_TESTS env var is set.
-Author: Bas Couwenberg <sebastic at debian.org>
-Bug: https://github.com/metaodi/osmapi/issues/80
-
---- a/tests/functional_tests.py
-+++ b/tests/functional_tests.py
-@@ -1,11 +1,17 @@
- import httpretty
- import unittest
- import osmapi
-+import os
-+
-+from nose.plugins.skip import SkipTest
- 
- 
- class TestOsmApiFunctional(unittest.TestCase):
-     @httpretty.activate
-     def test_deleted_element_raises_exception(self):
-+        if 'OFFLINE_TESTS' in os.environ:
-+            raise SkipTest
-+
-         httpretty.HTTPretty.allow_net_connect = False
-         httpretty.register_uri(
-             httpretty.GET,
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 99c4ae9..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-offline-tests.patch
diff --git a/debian/rules b/debian/rules
index 1e7645f..8cc69fd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ export PYBUILD_NAME=osmapi
 override_dh_auto_test:
 	# run tests
 	PYBUILD_SYSTEM=custom \
-	PYBUILD_TEST_ARGS="nosetests --verbose" OFFLINE_TESTS=1 dh_auto_test
+	PYBUILD_TEST_ARGS="nosetests --verbose" dh_auto_test
 
 override_dh_installchangelogs:
 	dh_installchangelogs CHANGELOG.md

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-osmapi.git



More information about the Pkg-grass-devel mailing list