Merge lp:~elopio/canonical-identity-provider/static-tests into lp:canonical-identity-provider/release

[Leo Arias]

Use the pep8 and pyflakes test cases from u1testutils.

Use the pep8 and pyflakes test cases from u1testutils.

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

=== renamed file 'api/tests/test_style.py' => 'api/tests/test_static_code_analysis.py'
--- api/tests/test_style.py	2012-12-03 17:28:54 +0000
+++ api/tests/test_static_code_analysis.py	2012-12-06 05:15:23 +0000
@@ -1,14 +1,14 @@
-from identityprovider.tests.unit.test_code_style import (
-    PackagePep8TestCase,
-    PyFlakesTestCase,
+from u1testutils import (
+    test_pep8_conformance,
+    test_pyflakes_analysis,
 )
 
 import api
 
 
-class ApiPep8TestCase(PackagePep8TestCase):
-    packages = [api]
-
-
-class ApiPyFlakesTestCase(PyFlakesTestCase):
-    src_dir = 'api'
+class ApiPep8TestCase(test_pep8_conformance.Pep8ConformanceTestCase):
+    packages = [api]
+
+
+class ApiPyFlakesTestCase(test_pyflakes_analysis.PyflakesAnalysisTestCase):
+    packages = [api]

=== renamed file 'identityprovider/tests/unit/test_code_style.py' => 'identityprovider/tests/unit/test_static_code_analysis.py'
--- identityprovider/tests/unit/test_code_style.py	2012-10-12 21:23:31 +0000
+++ identityprovider/tests/unit/test_static_code_analysis.py	2012-12-06 05:15:23 +0000
@@ -1,82 +1,19 @@
-import os
-import pep8
-
-from collections import defaultdict
-from cStringIO import StringIO
-from unittest import TestCase
+from u1testutils.static import (
+    test_pep8_conformance,
+    test_pyflakes_analysis,
+)
 
 import identityprovider
 
-from mock import patch
-from pyflakes.scripts.pyflakes import checkPath
-
-
-class PackagePep8TestCase(TestCase):
-    maxDiff = None
-    packages = []
+
+class IdentityProviderPep8TestCase(
+        test_pep8_conformance.Pep8ConformanceTestCase):
+
     exclude = ['migrations']
-
-    def message(self, text):
-        self.errors.append(text)
-
-    def setUp(self):
-        self.errors = {}
-        self.pep8style = pep8.StyleGuide(
-            counters=defaultdict(int),
-            doctest='',
-            exclude=self.exclude,
-            filename=['*.py'],
-            ignore=[],
-            messages=self.errors,
-            repeat=True,
-            select=[],
-            show_pep8=False,
-            show_source=False,
-            max_line_length=79,
-            quiet=0,
-            statistics=False,
-            testsuite='',
-            verbose=0,
-        )
-
-    def test_all_code(self):
-        for package in self.packages:
-            self.pep8style.input_dir(os.path.dirname(package.__file__))
-        self.assertEqual(self.pep8style.options.report.total_errors, 0)
-
-
-class IdentityProviderPep8TestCase(PackagePep8TestCase):
-
-    packages = [identityprovider]
-
-
-class PyFlakesTestCase(TestCase):
-
-    src_dir = 'identityprovider'
-
-    def test_pyflakes(self):
-        stdout = StringIO()
-        with patch('sys.stdout', stdout):
-            for dirpath, dirnames, filenames in os.walk(self.src_dir):
-                for filename in filenames:
-                    if filename.endswith('.py'):
-                        checkPath(os.path.join(dirpath, filename))
-
-        with open('tools/pyflakes.txt') as data:
-            exclude = [tuple([part.strip() for part in
-                       entry.split(':', 1)]) for entry in data
-                       if entry.strip()]
-        errors = []
-        result = stdout.getvalue().splitlines()
-        for line in result:
-            found = False
-            for first, second in exclude:
-                if first and first in line:
-                    if not second or second in line:
-                        found = True
-                        break
-
-            if not found:
-                errors.append(line)
-        if errors:
-            self.fail('\n'.join(errors))
+    packages = [identityprovider]
+
+
+class PyFlakesTestCase(test_pyflakes_analysis.PyflakesAnalysisTestCase):
+
+    packages = [identityprovider]
+    exclude_file = 'tools/pyflakes.txt'

=== modified file 'requirements/testing.txt'
--- requirements/testing.txt	2012-11-08 21:26:41 +0000
+++ requirements/testing.txt	2012-12-06 05:15:23 +0000
@@ -24,7 +24,7 @@
 selenium==2.25.0
 simplejson==2.3.0
 twisted==11.1.0
-u1-test-utils==0.1
+u1-test-utils==0.2
 unittest2==0.5.1
 wadllib==1.3.1
 wsgiref==0.1.2