[Python-modules-commits] r25985 - in packages/cookiecutter/trunk/debian/patches (3 files)

[bernat at users.alioth.debian.org]

    Date: Sunday, September 29, 2013 @ 11:07:30
  Author: bernat
Revision: 25985

More tests fix.

 - Don't rely on network access for tests.
 - Expect DS_Store files to be stripped out by dh_clean.

Added:
  packages/cookiecutter/trunk/debian/patches/dont-test-with-dstore-files.patch
Modified:
  packages/cookiecutter/trunk/debian/patches/dont-do-git-clone.patch
  packages/cookiecutter/trunk/debian/patches/series

Modified: packages/cookiecutter/trunk/debian/patches/dont-do-git-clone.patch
===================================================================
--- packages/cookiecutter/trunk/debian/patches/dont-do-git-clone.patch	2013-09-29 10:43:58 UTC (rev 25984)
+++ packages/cookiecutter/trunk/debian/patches/dont-do-git-clone.patch	2013-09-29 11:07:30 UTC (rev 25985)
@@ -4,8 +4,8 @@
 
 Index: cookiecutter-0.6.4/tests/test_vcs.py
 ===================================================================
---- cookiecutter-0.6.4.orig/tests/test_vcs.py	2013-09-08 16:28:04.351120333 +0200
-+++ cookiecutter-0.6.4/tests/test_vcs.py	2013-09-08 16:28:04.343120172 +0200
+--- cookiecutter-0.6.4.orig/tests/test_vcs.py	2013-09-29 13:00:09.586944734 +0200
++++ cookiecutter-0.6.4/tests/test_vcs.py	2013-09-29 13:01:05.696038267 +0200
 @@ -33,6 +33,7 @@
  
  class TestVCS(unittest.TestCase):
@@ -14,3 +14,31 @@
      def test_git_clone(self):
          repo_dir = vcs.git_clone(
              'https://github.com/audreyr/cookiecutter-pypackage.git'
+@@ -50,6 +51,7 @@
+             shutil.rmtree('cookiecutter-pypackage')
+         os.mkdir('cookiecutter-pypackage/')
+ 
++    @unittest.skip("disabled, no network")
+     @patch(input_str, lambda: 'y')
+     def test_git_clone_overwrite(self):
+         if not PY3:
+@@ -60,6 +62,7 @@
+         self.assertEqual(repo_dir, 'cookiecutter-pypackage')
+         self.assertTrue(os.path.isfile('cookiecutter-pypackage/README.rst'))
+ 
++    @unittest.skip("disabled, no network")
+     @patch(input_str, lambda: 'n')
+     def test_git_clone_cancel(self):
+         if not PY3:
+Index: cookiecutter-0.6.4/tests/test_main.py
+===================================================================
+--- cookiecutter-0.6.4.orig/tests/test_main.py	2013-08-21 12:33:41.000000000 +0200
++++ cookiecutter-0.6.4/tests/test_main.py	2013-09-29 13:01:55.521009341 +0200
+@@ -66,6 +66,7 @@
+ 
+ class TestCookiecutterRepoArg(unittest.TestCase):
+ 
++    @unittest.skip("disabled, no network")
+     @patch(input_str, lambda x: '')
+     def test_cookiecutter_git(self):
+         if not PY3:

Added: packages/cookiecutter/trunk/debian/patches/dont-test-with-dstore-files.patch
===================================================================
--- packages/cookiecutter/trunk/debian/patches/dont-test-with-dstore-files.patch	                        (rev 0)
+++ packages/cookiecutter/trunk/debian/patches/dont-test-with-dstore-files.patch	2013-09-29 11:07:30 UTC (rev 25985)
@@ -0,0 +1,24 @@
+Description: .DS_Store files are stripped out by dh_clean.
+Author: Vincent Bernat <bernat at debian.org>
+Forwarded: no
+
+Index: cookiecutter-0.6.4/tests/test_generate.py
+===================================================================
+--- cookiecutter-0.6.4.orig/tests/test_generate.py	2013-08-21 12:33:41.000000000 +0200
++++ cookiecutter-0.6.4/tests/test_generate.py	2013-09-29 13:05:13.552869050 +0200
+@@ -67,7 +67,6 @@
+             template_dir='tests/input{{binary_test}}'
+         )
+         self.assertTrue(os.path.isfile('tests/inputbinary_files/logo.png'))
+-        self.assertTrue(os.path.isfile('tests/inputbinary_files/.DS_Store'))
+         self.assertTrue(os.path.isfile('tests/inputbinary_files/readme.txt'))
+         self.assertTrue(
+             os.path.isfile('tests/inputbinary_files/some_font.otf')
+@@ -79,7 +78,6 @@
+             template_dir='tests/input{{binary_test}}'
+         )
+         expected = ['tests/inputbinary_files/binary_files/logo.png',
+-                    "tests/inputbinary_files/binary_files/.DS_Store",
+                     "tests/inputbinary_files/binary_files/readme.txt"]
+         for each in expected:
+             self.assertTrue(os.path.isfile(each))

Modified: packages/cookiecutter/trunk/debian/patches/series
===================================================================
--- packages/cookiecutter/trunk/debian/patches/series	2013-09-29 10:43:58 UTC (rev 25984)
+++ packages/cookiecutter/trunk/debian/patches/series	2013-09-29 11:07:30 UTC (rev 25985)
@@ -1 +1,2 @@
 dont-do-git-clone.patch
+dont-test-with-dstore-files.patch