Merge lp:~elopio/u1-test-utils/static-tests into lp:u1-test-utils

[Leo Arias]

Added the tests for pep8 conformance and pyflakes analysis to static test utils.
Added the selftests for static code analysis.

Added the test pep8 conformance to static test utils.

To run the selftests:
python -m unittest discover u1testutils/selftests

[lp:~elopio/u1-test-utils/static-tests]

17. By Leo Arias on 2012-12-04

Fixed the pyflakes test.

18. By Leo Arias on 2012-12-04

Added the static code analysis self tests.

19. By Leo Arias on 2012-12-04

Fixed pep8 errors.

20. By Leo Arias on 2012-12-04

Bumped the version.

21. By Leo Arias on 2012-12-04

Started the analysis from the top package and fixed errors.

22. By Leo Arias on 2012-12-04

Cleaned a little.

[Ricardo Kirkner (ricardokirkner)]

Looks good enough to me

review: Approve

[Natalia Bidart (nataliabidart)]

Looks pretty good!

review: Approve

=== modified file 'u1testutils/__init__.py'
--- u1testutils/__init__.py	2012-10-30 16:31:44 +0000
+++ u1testutils/__init__.py	2012-12-04 20:07:23 +0000
@@ -1,1 +1,1 @@
-__version__ = '0.1'
+__version__ = '0.2'

=== modified file 'u1testutils/django.py'
--- u1testutils/django.py	2011-10-24 12:34:32 +0000
+++ u1testutils/django.py	2012-12-04 20:07:23 +0000
@@ -79,5 +79,3 @@
                         result &= int(v) > 0
                         break
         return result
-
-

=== modified file 'u1testutils/logging.py'
--- u1testutils/logging.py	2011-02-08 14:03:09 +0000
+++ u1testutils/logging.py	2012-12-04 20:07:23 +0000
@@ -48,4 +48,3 @@
         # XXX michaeln 2010-08-18 Convert this to use testtools matchers
         # for much better failure output.
         self.assertTrue(self.memento_handler.check(level, message))
-

=== added directory 'u1testutils/selftests'
=== added file 'u1testutils/selftests/__init__.py'
=== added file 'u1testutils/selftests/test_static_code_analysis.py'
--- u1testutils/selftests/test_static_code_analysis.py	1970-01-01 00:00:00 +0000
+++ u1testutils/selftests/test_static_code_analysis.py	2012-12-04 20:07:23 +0000
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+
+# Copyright 2012 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License version 3, as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import u1testutils
+
+from u1testutils.static import (
+    test_pep8_conformance,
+    test_pyflakes_analysis,
+)
+
+
+class Pep8ConformanceTestCase(
+        test_pep8_conformance.Pep8ConformanceTestCase):
+
+    packages = [u1testutils]
+
+
+class PyflakesAnalysisTestCase(
+        test_pyflakes_analysis.PyflakesAnalysisTestCase):
+
+    packages = [u1testutils]

=== modified file 'u1testutils/sst/mail.py'
--- u1testutils/sst/mail.py	2012-06-29 11:43:54 +0000
+++ u1testutils/sst/mail.py	2012-12-04 20:07:23 +0000
@@ -18,10 +18,10 @@
         self.password = password
         if settings.IMAP_USE_SSL:
             self.imap = imaplib.IMAP4_SSL(
-                    settings.IMAP_SERVER, settings.IMAP_PORT)
+                settings.IMAP_SERVER, settings.IMAP_PORT)
         else:
             self.imap = imaplib.IMAP4(
-                    settings.IMAP_SERVER, settings.IMAP_PORT)
+                settings.IMAP_SERVER, settings.IMAP_PORT)
 
     def __enter__(self):
         self.imap.login(self.user, self.password)
@@ -82,7 +82,8 @@
             time.sleep(poll)
 
         raise AssertionError("No email sent to '%s' found in inbox "
-             "after polling for %s seconds." % (email_address, timeout))
+                             "after polling for %s seconds." %
+                             (email_address, timeout))
 
     def delete_msgs_sent_to(self, email_address):
         self.imap.select('Inbox')
@@ -112,4 +113,3 @@
 
 def email_body_includes(email_msg, text):
     assert text in email_msg.get_payload(), "'%s' was not in email body."
-

=== added directory 'u1testutils/static'
=== added file 'u1testutils/static/__init__.py'
=== added file 'u1testutils/static/test_pep8_conformance.py'
--- u1testutils/static/test_pep8_conformance.py	1970-01-01 00:00:00 +0000
+++ u1testutils/static/test_pep8_conformance.py	2012-12-04 20:07:23 +0000
@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+
+# Copyright 2012 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License version 3, as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+import pep8
+import unittest
+from collections import defaultdict
+
+
+class Pep8ConformanceTestCase(unittest.TestCase):
+
+    packages = []
+    exclude = []
+
+    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_pep8_conformance(self):
+        for package in self.packages:
+            self.pep8style.input_dir(os.path.dirname(package.__file__))
+        # FIXME: When this fails, the offending lines are not displayed, they
+        # should. -- vila 2012-10-19
+        self.assertEqual(self.pep8style.options.report.total_errors, 0)

=== added file 'u1testutils/static/test_pyflakes_analysis.py'
--- u1testutils/static/test_pyflakes_analysis.py	1970-01-01 00:00:00 +0000
+++ u1testutils/static/test_pyflakes_analysis.py	2012-12-04 20:07:23 +0000
@@ -0,0 +1,73 @@
+# -*- coding: utf-8 -*-
+
+# Copyright 2012 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License version 3, as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+import unittest
+import cStringIO
+
+from mock import patch
+from pyflakes.scripts.pyflakes import checkPath
+
+
+class PyflakesAnalysisTestCase(unittest.TestCase):
+
+    packages = []
+    exclude_file = None
+
+    def test_pyflakes_analysis(self):
+        string_out = cStringIO.StringIO()
+        with patch('sys.stdout', string_out):
+            for package in self.packages:
+                self._run_pyflakes_analysis(package)
+        results = string_out.getvalue().splitlines()
+        unexpected_errors = self._get_unexpected_errors(results)
+        self.assertEqual(unexpected_errors, [],
+                         '\n'.join(unexpected_errors))
+
+    def _run_pyflakes_analysis(self, package):
+        package_path = os.path.dirname(package.__file__)
+        for dir_path, dir_names, file_names in os.walk(package_path):
+            for file_name in file_names:
+                if file_name.endswith('.py'):
+                    file_path = os.path.join(dir_path, file_name)
+                    checkPath(file_path)
+
+    def _get_unexpected_errors(self, results):
+        unexpected_errors = []
+        expected_errors = self._parse_exclude_file()
+        if not expected_errors:
+            unexpected_errors = results
+        else:
+            for line in results:
+                found = False
+                for file_, error in expected_errors:
+                    if file_ in line and error in line:
+                        found = True
+                        break
+                if not found:
+                    unexpected_errors.append(line)
+        return unexpected_errors
+
+    def _parse_exclude_file(self):
+        excluded_errors = []
+        if self.exclude_file is not None:
+            with open(self.exclude_file) as file_:
+                for line in file_:
+                    if line.strip():
+                        source_file, error = [data.strip() for data in
+                                              line.split(':', 1)]
+                        excluded_errors.append((source_file, error))
+        return excluded_errors

=== modified file 'u1testutils/wsgi_intercept.py'
--- u1testutils/wsgi_intercept.py	2011-02-08 19:45:30 +0000
+++ u1testutils/wsgi_intercept.py	2012-12-04 20:07:23 +0000
@@ -11,24 +11,24 @@
     remove_wsgi_intercept,
     wsgi_fake_socket,
     WSGI_HTTPConnection,
-    )
+)
 from wsgi_intercept.httplib2_intercept import (
     install,
     uninstall,
-    )
+)
 from wsgi_intercept.urllib2_intercept import (
     install_opener,
     uninstall_opener,
     WSGI_HTTPHandler,
     WSGI_HTTPSHandler,
-    )
+)
 
 
 class WSGIInterceptedTestCase(TestCase):
     def setup_intercept(self, callbacks, intercept_api=False):
         """Setup the WSGI intercepts.
 
-        `callbacks` have to be provided to call upon request of the 
+        `callbacks` have to be provided to call upon request of the
         intercepted urls. They should be supplied as a dictionary of
         ((hostname, port), callback).
 
@@ -68,7 +68,8 @@
 
     def patch_wsgi_intercept(self):
         # fix handler order to have highest priority
-        self.old_WSGI_HTTPHandler_handler_order = WSGI_HTTPHandler.handler_order
+        self.old_WSGI_HTTPHandler_handler_order = \
+            WSGI_HTTPHandler.handler_order
         WSGI_HTTPHandler.handler_order = 1
 
         if WSGI_HTTPSHandler is not None:
@@ -76,7 +77,8 @@
                 return self.do_open(WSGI_HTTPSConnection, req)
 
             # use HTTPSHandler for https connections
-            self.old_WSGI_HTTPSHandler_https_open = WSGI_HTTPSHandler.https_open
+            self.old_WSGI_HTTPSHandler_https_open = \
+                WSGI_HTTPSHandler.https_open
             WSGI_HTTPSHandler.https_open = https_open
 
             # fix handler order to have highest priority
@@ -85,10 +87,12 @@
             WSGI_HTTPSHandler.handler_order = 1
 
     def unpatch_wsgi_intercept(self):
-        WSGI_HTTPHandler.handler_order = self.old_WSGI_HTTPHandler_handler_order
+        WSGI_HTTPHandler.handler_order = \
+            self.old_WSGI_HTTPHandler_handler_order
 
         if WSGI_HTTPSHandler is not None:
-            WSGI_HTTPSHandler.https_open = self.old_WSGI_HTTPSHandler_https_open
+            WSGI_HTTPSHandler.https_open = \
+                self.old_WSGI_HTTPSHandler_https_open
 
             WSGI_HTTPSHandler.handler_order = \
                 self.old_WSGI_HTTPSHandler_handler_order
@@ -97,7 +101,7 @@
         parsed = []
         for url in urls:
             scheme = url.find('://')
-            hostport = url[scheme+3:]
+            hostport = url[scheme + 3:]
             parts = hostport.split(':')
             host = parts[0]
             if len(parts) == 1:
@@ -133,7 +137,7 @@
             (app, script_name) = self.get_app(self.host, self.port)
             if app:
                 if debuglevel:
-                    sys.stderr.write('INTERCEPTING call to %s:%s\n' % \
+                    sys.stderr.write('INTERCEPTING call to %s:%s\n' %
                                      (self.host, self.port,))
                 self.sock = wsgi_fake_socket(app, self.host, self.port,
                                              script_name)
@@ -144,4 +148,3 @@
             if debuglevel:              # intercept & print out tracebacks
                 traceback.print_exc()
             raise
-