[arch-commits] Commit in flake8/trunk (2 files)

[Evangelos Foutras]

    Date: Sunday, September 20, 2015 @ 08:48:28
  Author: foutrelis
Revision: 141182

Fix test to work with Python 3.5's unittest.mock

Added:
  flake8/trunk/fix-flake8-tests-using-mock-to-work-with-1.1.x-branch.patch
Modified:
  flake8/trunk/PKGBUILD

-------------------------------------------------------------+
 PKGBUILD                                                    |   11 +-
 fix-flake8-tests-using-mock-to-work-with-1.1.x-branch.patch |   43 ++++++++++
 2 files changed, 51 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-20 06:01:29 UTC (rev 141181)
+++ PKGBUILD	2015-09-20 06:48:28 UTC (rev 141182)
@@ -15,9 +15,11 @@
 license=('MIT')
 makedepends=('python-setuptools' 'python2-setuptools' 'python-pyflakes' 'python2-pyflakes'
              'pep8' 'python2-pep8' 'python-mccabe' 'python2-mccabe')
-checkdepends=('python-nose' 'python2-nose' 'python-mock' 'python2-mock')
-source=("https://pypi.python.org/packages/source/f/${pkgbase}/${pkgbase}-${pkgver}.tar.gz")
-md5sums=('ed45d3db81a3b7c88bd63c6e37ca1d65')
+checkdepends=('python-nose' 'python2-nose' 'python2-mock')
+source=("https://pypi.python.org/packages/source/f/${pkgbase}/${pkgbase}-${pkgver}.tar.gz"
+        'fix-flake8-tests-using-mock-to-work-with-1.1.x-branch.patch')
+md5sums=('ed45d3db81a3b7c88bd63c6e37ca1d65'
+         '76004de2511275c09fba49c43691aaf0')
 
 prepare() {
   # We have patched pep8 to fix the problem, allowing 1.6.2)
@@ -25,6 +27,9 @@
       -e 's/pyflakes >= 0.8.1, < 0.9/pyflakes >= 0.8.1/' \
       -i $pkgbase-$pkgver/setup.py
 
+  # Fix test to work with Python 3.5's unittest.mock
+  patch -d ${pkgbase}-${pkgver} -Np1 <fix-flake8-tests-using-mock-to-work-with-1.1.x-branch.patch
+
   cp -a ${pkgbase}-${pkgver}{,-py2}
 }
 

Added: fix-flake8-tests-using-mock-to-work-with-1.1.x-branch.patch
===================================================================
--- fix-flake8-tests-using-mock-to-work-with-1.1.x-branch.patch	                        (rev 0)
+++ fix-flake8-tests-using-mock-to-work-with-1.1.x-branch.patch	2015-09-20 06:48:28 UTC (rev 141182)
@@ -0,0 +1,43 @@
+From b0f30f97fbec04c1ab7cb8937f636822eab63885 Mon Sep 17 00:00:00 2001
+From: Ian Cordasco <graffatcolmingov at gmail.com>
+Date: Fri, 10 Jul 2015 09:34:49 -0500
+Subject: [PATCH] Fix flake8 tests using mock to work with 1.1.x branch
+
+---
+ flake8/tests/test_engine.py | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/flake8/tests/test_engine.py b/flake8/tests/test_engine.py
+index 06fe62a..60b388c 100644
+--- a/flake8/tests/test_engine.py
++++ b/flake8/tests/test_engine.py
+@@ -52,7 +52,7 @@ class TestEngine(unittest.TestCase):
+             self.assertTrue(len(registered_exts[0]) > 0)
+             for i in registered_exts[1:]:
+                 self.assertTrue(isinstance(i, list))
+-            register_check.assert_called()
++            self.assertTrue(register_check.called)
+ 
+     def test_get_parser(self):
+         # setup
+@@ -67,13 +67,13 @@ class TestEngine(unittest.TestCase):
+         # actual call we're testing
+         parser, hooks = engine.get_parser()
+         # assertions
+-        re.assert_called()
+-        gpv.assert_called()
++        self.assertTrue(re.called)
++        self.assertTrue(gpv.called)
+         pgp.assert_called_once_with(
+             'flake8',
+             '%s (pyflakes: 0.7, mccabe: 0.2) Python Version' % __version__)
+-        m.remove_option.assert_called()
+-        m.add_option.assert_called()
++        self.assertTrue(m.remove_option.called)
++        self.assertTrue(m.add_option.called)
+         self.assertEqual(parser, m)
+         self.assertEqual(hooks, [])
+         # clean-up
+-- 
+2.5.2
+