[Python-modules-commits] r30781 - in packages/cookiecutter/trunk/debian (4 files)
bernat at users.alioth.debian.org
bernat at users.alioth.debian.org
Sun Sep 28 08:07:31 UTC 2014
Date: Sunday, September 28, 2014 @ 08:07:30
Author: bernat
Revision: 30781
Drop network related patch.
Not needed anymore. Refresh the other patch.
Modified:
packages/cookiecutter/trunk/debian/changelog
packages/cookiecutter/trunk/debian/patches/series
packages/cookiecutter/trunk/debian/patches/test-dont-expect-ds-store.patch
Deleted:
packages/cookiecutter/trunk/debian/patches/disable-network-tests.patch
Modified: packages/cookiecutter/trunk/debian/changelog
===================================================================
--- packages/cookiecutter/trunk/debian/changelog 2014-09-28 08:00:44 UTC (rev 30780)
+++ packages/cookiecutter/trunk/debian/changelog 2014-09-28 08:07:30 UTC (rev 30781)
@@ -1,6 +1,7 @@
cookiecutter (0.7.2-1) unstable; urgency=medium
* New upstream release
+ + Drop network related patch, not needed anymore.
-- Vincent Bernat <bernat at debian.org> Sun, 28 Sep 2014 10:00:14 +0200
Deleted: packages/cookiecutter/trunk/debian/patches/disable-network-tests.patch
===================================================================
--- packages/cookiecutter/trunk/debian/patches/disable-network-tests.patch 2014-09-28 08:00:44 UTC (rev 30780)
+++ packages/cookiecutter/trunk/debian/patches/disable-network-tests.patch 2014-09-28 08:07:30 UTC (rev 30781)
@@ -1,113 +0,0 @@
-Author: Vincent Bernat
-Subject: add an environment variable to disable network tests
-
- This is useful when we want to test the package on an environement
- without networking. This can happen on some buildbots, like the Debian
- builders.
-
-Forwarded: https://github.com/audreyr/cookiecutter/pull/167
-
-diff --git a/tests/test_examples.py b/tests/test_examples.py
-index eb325ee13ef1..b5c579e5d1ce 100755
---- a/tests/test_examples.py
-+++ b/tests/test_examples.py
-@@ -37,6 +37,11 @@ try:
- except KeyError:
- travis = False
-
-+try:
-+ nonetwork = os.environ[u'DISABLE_NETWORK_TESTS']
-+except KeyError:
-+ nonetwork = False
-+
- from cookiecutter import config, utils
- from tests import force_delete, CookiecutterCleanSystemTestCase
-
-@@ -45,6 +50,7 @@ logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.DEBUG)
-
-
- @unittest.skipIf(condition=travis, reason='Works locally with tox but fails on Travis.')
-+ at unittest.skipIf(condition=nonetwork, reason='Needs a network connection to GitHub.')
- class TestPyPackage(CookiecutterCleanSystemTestCase):
-
-
-@@ -79,6 +85,7 @@ class TestPyPackage(CookiecutterCleanSystemTestCase):
-
-
- @unittest.skipIf(condition=travis, reason='Works locally with tox but fails on Travis.')
-+ at unittest.skipIf(condition=nonetwork, reason='Needs a network connection to GitHub.')
- class TestJQuery(CookiecutterCleanSystemTestCase):
-
-
-@@ -113,6 +120,7 @@ class TestJQuery(CookiecutterCleanSystemTestCase):
-
-
- @unittest.skipIf(condition=travis, reason='Works locally with tox but fails on Travis.')
-+ at unittest.skipIf(condition=nonetwork, reason='Needs a network connection to GitHub.')
- class TestExamplesRepoArg(CookiecutterCleanSystemTestCase):
-
- def tearDown(self):
-@@ -138,6 +146,7 @@ class TestExamplesRepoArg(CookiecutterCleanSystemTestCase):
-
-
- @unittest.skipIf(condition=travis, reason='Works locally with tox but fails on Travis.')
-+ at unittest.skipIf(condition=nonetwork, reason='Needs a network connection to GitHub.')
- class TestGitBranch(CookiecutterCleanSystemTestCase):
-
- def tearDown(self):
-diff --git a/tests/test_main.py b/tests/test_main.py
-index 52e69e2f8e60..6a5a87555232 100755
---- a/tests/test_main.py
-+++ b/tests/test_main.py
-@@ -31,6 +31,11 @@ else:
- input_str = '__builtin__.raw_input'
- from cStringIO import StringIO
-
-+try:
-+ nonetwork = os.environ[u'DISABLE_NETWORK_TESTS']
-+except KeyError:
-+ nonetwork = False
-+
-
- # Log debug and above to console
- logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.DEBUG)
-@@ -91,6 +96,7 @@ class TestArgParsing(unittest.TestCase):
- self.assertEqual(args.checkout, 'develop')
-
-
-+ at unittest.skipIf(condition=nonetwork, reason='Needs a network connection to GitHub/Bitbucket.')
- class TestCookiecutterRepoArg(CookiecutterCleanSystemTestCase):
-
- def tearDown(self):
-diff --git a/tests/test_vcs.py b/tests/test_vcs.py
-index c26aa5b51a5f..85a84bb04884 100755
---- a/tests/test_vcs.py
-+++ b/tests/test_vcs.py
-@@ -28,6 +28,11 @@ else:
-
- from cookiecutter import utils, vcs
-
-+try:
-+ nonetwork = os.environ[u'DISABLE_NETWORK_TESTS']
-+except KeyError:
-+ nonetwork = False
-+
-
- # Log debug and above to console
- logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.DEBUG)
-@@ -53,6 +58,7 @@ class TestIdentifyRepo(unittest.TestCase):
- self.assertEqual(vcs.identify_repo(repo_url), "hg")
-
-
-+ at unittest.skipIf(condition=nonetwork, reason='Needs a network connection to GitHub/Bitbucket.')
- class TestVCS(unittest.TestCase):
-
- def test_git_clone(self):
-@@ -111,6 +117,7 @@ class TestVCS(unittest.TestCase):
- shutil.rmtree('cookiecutter-trytonmodule')
-
-
-+ at unittest.skipIf(condition=nonetwork, reason='Needs a network connection to GitHub/Bitbucket.')
- class TestVCSPrompt(unittest.TestCase):
-
- def setUp(self):
Modified: packages/cookiecutter/trunk/debian/patches/series
===================================================================
--- packages/cookiecutter/trunk/debian/patches/series 2014-09-28 08:00:44 UTC (rev 30780)
+++ packages/cookiecutter/trunk/debian/patches/series 2014-09-28 08:07:30 UTC (rev 30781)
@@ -1,2 +1 @@
test-dont-expect-ds-store.patch
-disable-network-tests.patch
Modified: packages/cookiecutter/trunk/debian/patches/test-dont-expect-ds-store.patch
===================================================================
--- packages/cookiecutter/trunk/debian/patches/test-dont-expect-ds-store.patch 2014-09-28 08:00:44 UTC (rev 30780)
+++ packages/cookiecutter/trunk/debian/patches/test-dont-expect-ds-store.patch 2014-09-28 08:07:30 UTC (rev 30781)
@@ -2,11 +2,11 @@
Author: Vincent Bernat
Forwarded: no
-Index: cookiecutter/tests/test_generate.py
+Index: cookiecutter-0.7.2/tests/test_generate.py
===================================================================
---- cookiecutter.orig/tests/test_generate.py 2013-12-30 14:56:44.137629436 +0100
-+++ cookiecutter/tests/test_generate.py 2014-04-27 12:35:49.502988652 +0200
-@@ -119,7 +119,6 @@
+--- cookiecutter-0.7.2.orig/tests/test_generate.py
++++ cookiecutter-0.7.2/tests/test_generate.py
+@@ -118,7 +118,6 @@ class TestGenerateFiles(CookiecutterClea
repo_dir='tests/test-generate-binaries'
)
self.assertTrue(os.path.isfile('inputbinary_files/logo.png'))
@@ -14,7 +14,7 @@
self.assertTrue(os.path.isfile('inputbinary_files/readme.txt'))
self.assertTrue(
os.path.isfile('inputbinary_files/some_font.otf')
-@@ -128,9 +127,6 @@
+@@ -127,9 +126,6 @@ class TestGenerateFiles(CookiecutterClea
os.path.isfile('inputbinary_files/binary_files/logo.png')
)
self.assertTrue(
More information about the Python-modules-commits
mailing list