Merge lp:~ev/uci-engine/pyflakes-the-world into lp:uci-engine

[Evan]

Rather than opt-in to PEP8 and pyflakes testing module-by-module, cover all python code, non-module code included, with an explicit opt-out.

Another branch I worked on while flying to Austin. Rather than opt-in to PEP8 and pyflakes testing module-by-module, cover all python code, non-module code included, with an explicit opt-out.

Time and time again we failed to test for pep8 or pyflakes because we forgot to drop a test_style or find the right directory in the test_style code.

I expect this MP to be controversial, but I no of no other way to ensure we don't miss files with pyflakes in the future.

[lp:~ev/uci-engine/pyflakes-the-world]

910. By Evan on 2014-11-25

Missing reference to test_style.

[Paul Larson (pwlars)]

no controversy as far as I'm concerned. Any python we have that doesn't pass pyflakes should need a good reason to opt out, otherwise the fixes are almost always trivial. The +67/-558 diffstat makes it clear that this is far more efficient than reproducing the pyflakes test all over the place too.

A couple of minor style things, but otherwise a huge +1 from me

review: Approve

[lp:~ev/uci-engine/pyflakes-the-world]

911. By Evan on 2014-11-25

Fix up test references in README.

912. By Evan on 2014-11-25

Use .format

913. By Evan on 2014-11-26

Missed one example fix.

914. By Evan on 2014-11-26

Make the error text part of the exception so it's only printed at the end. Thanks for the tip, Vincent.

915. By Evan on 2014-11-26

Unneeded import.

916. By Evan on 2014-11-26

Add great explanation of django's test star imports from Vincent.

917. By Evan on 2014-11-26

Refer to the previous commit in the syntax tests.

918. By Canonical CI Engineering on 2014-11-27

Adjust comment to make note of the fact that we need to resync with cupstream2distro trunk in a follow up MP.

Unmerged revisions

918. By Canonical CI Engineering on 2014-11-27

Adjust comment to make note of the fact that we need to resync with cupstream2distro trunk in a follow up MP.

917. By Evan on 2014-11-26

Refer to the previous commit in the syntax tests.

916. By Evan on 2014-11-26

Add great explanation of django's test star imports from Vincent.

915. By Evan on 2014-11-26

Unneeded import.

914. By Evan on 2014-11-26

Make the error text part of the exception so it's only printed at the end. Thanks for the tip, Vincent.

913. By Evan on 2014-11-26

Missed one example fix.

912. By Evan on 2014-11-25

Use .format

911. By Evan on 2014-11-25

Fix up test references in README.

910. By Evan on 2014-11-25

Missing reference to test_style.

909. By Evan on 2014-11-25

Remove more style tests.

=== removed file 'branch-source-builder/bsbuilder/tests/test_style.py'
--- branch-source-builder/bsbuilder/tests/test_style.py	2014-02-15 12:06:40 +0000
+++ branch-source-builder/bsbuilder/tests/test_style.py	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-# Ubuntu CI Engine
-# Copyright 2014 Canonical Ltd.
-
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero 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 Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-from ucitests import styles
-
-import bsbuilder
-
-
-class TestPep8(styles.TestPep8):
-
-    packages = [bsbuilder]
-
-
-class TestPyflakes(styles.TestPyflakes):
-
-    packages = [bsbuilder]

=== modified file 'britney_proxy/bin/uci-britney-post-deploy'
--- britney_proxy/bin/uci-britney-post-deploy	2014-10-15 09:25:55 +0000
+++ britney_proxy/bin/uci-britney-post-deploy	2014-11-25 17:16:49 +0000
@@ -29,7 +29,7 @@
 sys.path.insert(0, BRANCH_ROOT)
 
 
-from tests import deployers
+from testing import deployers
 
 
 def main(args):

=== removed file 'britney_proxy/britney/tests/test_style.py'
--- britney_proxy/britney/tests/test_style.py	2014-09-22 13:21:25 +0000
+++ britney_proxy/britney/tests/test_style.py	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-# Ubuntu CI Engine
-# Copyright 2014 Canonical Ltd.
-
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero 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 Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-from ucitests import styles
-
-import britney
-
-
-class TestPep8(styles.TestPep8):
-
-    packages = [britney]
-
-
-class TestPyflakes(styles.TestPyflakes):
-
-    packages = [britney]

=== removed file 'ci-utils/ci_utils/tests/test_style.py'
--- ci-utils/ci_utils/tests/test_style.py	2014-02-15 12:06:40 +0000
+++ ci-utils/ci_utils/tests/test_style.py	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-# Ubuntu CI Engine
-# Copyright 2014 Canonical Ltd.
-
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero 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 Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-from ucitests import styles
-
-import ci_utils
-
-
-class TestPep8(styles.TestPep8):
-
-    packages = [ci_utils]
-
-
-class TestPyflakes(styles.TestPyflakes):
-
-    packages = [ci_utils]

=== removed file 'gatekeeper/gatekeeper/tests/test_style.py'
--- gatekeeper/gatekeeper/tests/test_style.py	2014-04-25 17:06:52 +0000
+++ gatekeeper/gatekeeper/tests/test_style.py	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-# Ubuntu CI Engine
-# Copyright 2014 Canonical Ltd.
-
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero 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 Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-from ucitests import styles
-
-import gatekeeper
-
-
-class TestPep8(styles.TestPep8):
-
-    packages = [gatekeeper]
-
-
-class TestPyflakes(styles.TestPyflakes):
-
-    packages = [gatekeeper]

=== removed file 'image-builder/imagebuilder/tests/test_style.py'
--- image-builder/imagebuilder/tests/test_style.py	2014-02-15 12:06:40 +0000
+++ image-builder/imagebuilder/tests/test_style.py	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-# Ubuntu CI Engine
-# Copyright 2014 Canonical Ltd.
-
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero 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 Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-from ucitests import styles
-
-import imagebuilder
-
-
-class TestPep8(styles.TestPep8):
-
-    packages = [imagebuilder]
-
-
-class TestPyflakes(styles.TestPyflakes):
-
-    packages = [imagebuilder]

=== removed file 'juju-deployer/test_style.py'
--- juju-deployer/test_style.py	2014-06-18 13:15:24 +0000
+++ juju-deployer/test_style.py	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-# Ubuntu CI Engine
-# Copyright 2014 Canonical Ltd.
-
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero 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 Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import os
-
-
-HERE = os.path.abspath(os.path.dirname(__file__))
-
-
-from testing import styles
-
-
-class TestPep8(styles.TestPep8):
-
-    directory = HERE
-
-
-class TestPyflakes(styles.TestPyflakes):
-
-    directory = HERE

=== removed file 'lander/lander/tests/test_style.py'
--- lander/lander/tests/test_style.py	2014-10-07 10:04:01 +0000
+++ lander/lander/tests/test_style.py	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-# Ubuntu CI Engine
-# Copyright 2014 Canonical Ltd.
-
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero 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 Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import os
-from ucitests import styles
-
-import lander
-from testing import styles as testing_styles
-
-HERE = os.path.abspath(os.path.dirname(__file__))
-
-
-class TestPep8(styles.TestPep8):
-
-    packages = [lander]
-
-
-class TestPyflakes(styles.TestPyflakes):
-
-    packages = [lander]
-
-
-class TestPep8Bin(testing_styles.TestPep8):
-
-    directory = os.path.join(HERE, '..', '..', 'bin')
-
-
-class TestPyflakesBin(testing_styles.TestPyflakes):
-
-    directory = os.path.join(HERE, '..', '..', 'bin')

=== removed file 'ppa-creator/ppacreator/tests/test_style.py'
--- ppa-creator/ppacreator/tests/test_style.py	2014-07-30 21:44:23 +0000
+++ ppa-creator/ppacreator/tests/test_style.py	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-# Ubuntu CI Engine
-# Copyright 2014 Canonical Ltd.
-
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero 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 Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-from ucitests import styles
-
-import ppacreator
-
-
-class TestPep8(styles.TestPep8):
-
-    packages = [ppacreator]
-
-
-class TestPyflakes(styles.TestPyflakes):
-
-    packages = [ppacreator]

=== removed file 'publisher/publisher/tests/test_style.py'
--- publisher/publisher/tests/test_style.py	2014-10-07 10:04:01 +0000
+++ publisher/publisher/tests/test_style.py	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-# Ubuntu CI Engine
-# Copyright 2014 Canonical Ltd.
-
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero 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 Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import os
-from ucitests import styles
-
-import publisher
-from testing import styles as testing_styles
-
-HERE = os.path.abspath(os.path.dirname(__file__))
-
-
-class TestPep8(styles.TestPep8):
-
-    packages = [publisher]
-
-
-class TestPyflakes(styles.TestPyflakes):
-
-    packages = [publisher]
-
-
-class TestPep8Bin(testing_styles.TestPep8):
-
-    directory = os.path.join(HERE, '..', '..', 'bin')
-
-
-class TestPyflakesBin(testing_styles.TestPyflakes):
-
-    directory = os.path.join(HERE, '..', '..', 'bin')

=== removed file 'test_runner/tstrun/tests/test_style.py'
--- test_runner/tstrun/tests/test_style.py	2014-02-15 12:06:40 +0000
+++ test_runner/tstrun/tests/test_style.py	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-# Ubuntu CI Engine
-# Copyright 2014 Canonical Ltd.
-
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero 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 Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-from ucitests import styles
-
-import tstrun
-
-
-class TestPep8(styles.TestPep8):
-
-    packages = [tstrun]
-
-
-class TestPyflakes(styles.TestPyflakes):
-
-    packages = [tstrun]

=== renamed file 'tests/deployers.py' => 'testing/deployers.py'
=== modified file 'testing/run_tests.py'
--- testing/run_tests.py	2014-11-03 21:04:50 +0000
+++ testing/run_tests.py	2014-11-25 17:16:49 +0000
@@ -308,7 +308,7 @@
 
     :return: The test suite for all collected tests.
     """
-    components = ['juju-deployer']
+    components = ['juju-deployer', 'tests/project', 'bin']
     loader = loaders.Loader()
     suite = loader.suiteClass()
     for c in components:
@@ -330,7 +330,7 @@
     """
     loader = loaders.Loader()
     suite = loader.suiteClass()
-    suite.addTests(loader.loadTestsFromTree('tests'))
+    suite.addTests(loader.loadTestsFromTree('tests/integration'))
     suite = filters.include_regexps(include_regexps, suite)
     suite = filters.exclude_regexps(exclude_regexps, suite)
     return suite

=== removed file 'testing/styles.py'
--- testing/styles.py	2014-06-19 10:07:29 +0000
+++ testing/styles.py	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-# Ubuntu CI Engine
-# Copyright 2014 Canonical Ltd.
-
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero 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 Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-"""Helpers to implement style tests.
-
-uci-tests relies on the assumption that all tests reside in python
-packages. This isn't true for some of the uci-engine tests. The classes below
-provide a directory where test files should be checked instead.
-"""
-
-
-import cStringIO
-import os
-
-
-from ucitests import (
-    assertions,
-    styles,
-)
-
-
-class TestPep8(styles.TestPep8):
-
-    directory = None
-
-    def test_pep8_conformance(self):
-        self.assertIsNot(None, self.directory,
-                         'You should define the directory to check')
-        self.pep8style.input_dir(self.directory)
-        self.assertEqual([], self.report._msgs,
-                         '\n'.join(self.report._msgs))
-
-
-class TestPyflakes(styles.TestPyflakes):
-
-    directory = None
-
-    def test_pyflakes_conformance(self):
-        from pyflakes import (
-            api,
-            reporter,
-        )
-        self.assertIsNot(None, self.directory,
-                         'You should define the directory to check')
-        out = cStringIO.StringIO()
-        err = cStringIO.StringIO()
-        report = reporter.Reporter(out, err)
-        paths = [self.directory]
-
-        walker = styles.PythonFileWalker(None)
-        for p in paths:
-            root, base = os.path.split(p)
-            sw = walker.SubWalker(root)
-            styles.pyflakes_check_dir(sw, base, self.excludes,
-                                      api.checkPath, report)
-        out_val = out.getvalue()
-        if out_val:
-            assertions.assertMultiLineAlmostEqual(self, '', out_val)
-        err_val = err.getvalue()
-        if err_val:
-            assertions.assertMultiLineAlmostEqual(self, '', err_val)

=== removed file 'testing/test_style.py'
--- testing/test_style.py	2014-06-13 10:38:02 +0000
+++ testing/test_style.py	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-# Ubuntu CI Engine
-# Copyright 2014 Canonical Ltd.
-
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero 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 Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-from ucitests import styles
-
-import testing
-
-
-class TestPep8(styles.TestPep8):
-
-    packages = [testing]
-
-
-class TestPyflakes(styles.TestPyflakes):
-
-    packages = [testing]

=== added directory 'tests/integration'
=== added file 'tests/integration/__init__.py'
=== renamed file 'tests/test_britney.py' => 'tests/integration/test_britney.py'
--- tests/test_britney.py	2014-11-03 12:59:48 +0000
+++ tests/integration/test_britney.py	2014-11-25 17:16:49 +0000
@@ -25,7 +25,7 @@
     image_store,
 )
 import deploy
-import deployers
+from testing import deployers
 from ucitests import (
     assertions,
     fixtures,

=== renamed file 'tests/test_bsbuilder.py' => 'tests/integration/test_bsbuilder.py'
--- tests/test_bsbuilder.py	2014-06-23 19:41:51 +0000
+++ tests/integration/test_bsbuilder.py	2014-11-25 17:16:49 +0000
@@ -16,7 +16,7 @@
 
 
 import unittest
-import deployers
+from testing import deployers
 
 
 class TestBsBuilder(deployers.DeployerTest):

=== renamed file 'tests/test_data_store.py' => 'tests/integration/test_data_store.py'
=== renamed file 'tests/test_image_builder.py' => 'tests/integration/test_image_builder.py'
--- tests/test_image_builder.py	2014-10-07 10:04:01 +0000
+++ tests/integration/test_image_builder.py	2014-11-25 17:16:49 +0000
@@ -16,7 +16,7 @@
 
 
 import unittest
-import deployers
+from testing import deployers
 
 
 class TestImageBuilder(deployers.DeployerTest):

=== renamed file 'tests/test_image_store.py' => 'tests/integration/test_image_store.py'
=== renamed file 'tests/test_ppacreator.py' => 'tests/integration/test_ppacreator.py'
--- tests/test_ppacreator.py	2014-10-30 20:46:10 +0000
+++ tests/integration/test_ppacreator.py	2014-11-25 17:16:49 +0000
@@ -17,7 +17,7 @@
 import json
 import uuid
 import unittest
-import deployers
+from testing import deployers
 import deploy
 
 from ci_utils import amqp_utils

=== renamed file 'tests/test_publisher.py' => 'tests/integration/test_publisher.py'
--- tests/test_publisher.py	2014-10-07 10:04:01 +0000
+++ tests/integration/test_publisher.py	2014-11-25 17:16:49 +0000
@@ -18,7 +18,7 @@
 
 
 import unittest
-import deployers
+from testing import deployers
 
 
 class TestPublisher(deployers.DeployerTest):

=== renamed file 'tests/test_rabbit.py' => 'tests/integration/test_rabbit.py'
--- tests/test_rabbit.py	2014-10-23 14:07:48 +0000
+++ tests/integration/test_rabbit.py	2014-11-25 17:16:49 +0000
@@ -14,7 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import unittest
 
-import deployers
+from testing import deployers
 from ucitests import fixtures
 
 from ci_utils import amqp_utils

=== renamed file 'tests/test_test_runner.py' => 'tests/integration/test_test_runner.py'
--- tests/test_test_runner.py	2014-10-15 10:35:04 +0000
+++ tests/integration/test_test_runner.py	2014-11-25 17:16:49 +0000
@@ -24,7 +24,7 @@
     image_store,
 )
 import deploy
-import deployers
+from testing import deployers
 from ucitests import (
     assertions,
 )

=== renamed file 'tests/test_ticket_system.py' => 'tests/integration/test_ticket_system.py'
--- tests/test_ticket_system.py	2014-11-25 01:21:41 +0000
+++ tests/integration/test_ticket_system.py	2014-11-25 17:16:49 +0000
@@ -16,7 +16,7 @@
 import httplib2
 import json
 import unittest
-import deployers
+from testing import deployers
 
 from ci_utils.ticket_states import TicketWorkflowStep
 

=== renamed file 'tests/test_validator.py' => 'tests/integration/test_validator.py'
--- tests/test_validator.py	2014-08-14 17:21:56 +0000
+++ tests/integration/test_validator.py	2014-11-25 17:16:49 +0000
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import unittest
-import deployers
+from testing import deployers
 
 
 class TestValidator(deployers.DeployerTest):

=== renamed file 'tests/test_webui.py' => 'tests/integration/test_webui.py'
--- tests/test_webui.py	2014-11-12 12:32:19 +0000
+++ tests/integration/test_webui.py	2014-11-25 17:16:49 +0000
@@ -32,7 +32,7 @@
     cases,
 )
 
-import deployers
+from testing import deployers
 
 
 class WebUITest(cases.SSTTestCase):

=== added directory 'tests/project'
=== added file 'tests/project/__init__.py'
=== renamed file 'tests/test_style.py' => 'tests/project/test_static.py'
--- tests/test_style.py	2014-11-10 09:49:20 +0000
+++ tests/project/test_static.py	2014-11-25 17:16:49 +0000
@@ -13,40 +13,11 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import os
 import subprocess
 import unittest
 
 
-HERE = os.path.abspath(os.path.dirname(__file__))
-
-
-from testing import styles
-
-
-class TestPep8(styles.TestPep8):
-
-    directory = HERE
-
-
-class TestPyflakes(styles.TestPyflakes):
-
-    directory = HERE
-
-
-class TestBinPep8(styles.TestPep8):
-    """Pep8 tests for the 'bin' directory in branch root."""
-
-    directory = os.path.abspath(os.path.join(HERE, '..', 'bin'))
-
-
-class TestBinPyflakes(styles.TestPyflakes):
-    """Pyflakes tests for the 'bin' directory in branch root."""
-
-    directory = os.path.abspath(os.path.join(HERE, '..', 'bin'))
-
-
-class TestNoExit(unittest.TestCase):
+class TestStatic(unittest.TestCase):
 
     def test_no_bare_exit(self):
         output = subprocess.check_output(
@@ -58,3 +29,12 @@
 https://docs.python.org/2/library/constants.html#exit
 Please use sys.exit() below:
 ''' + output)
+
+    def test_python_shebang(self):
+        output = subprocess.check_output(
+            ['bzr', 'grep', '--from-root', '-n', '^#!/.*/python'])
+        msg = ('''
+Do not call /usr/bin/python directly in a shebang (#!) as this breaks
+virtualenv. Instead, use '#!/usr/bin/env python' in the instances below:
+''' + output)
+        self.assertEqual('', output, msg=msg)

=== added file 'tests/project/test_syntax.py'
--- tests/project/test_syntax.py	1970-01-01 00:00:00 +0000
+++ tests/project/test_syntax.py	2014-11-25 17:16:49 +0000
@@ -0,0 +1,44 @@
+# Rather than opt-in to PEP8 and pyflakes testing module-by-module, these tests
+# cover all python code, non-module code included, with an explicit opt-out.
+
+import os
+import sys
+import pep8
+import cStringIO
+from pyflakes import api, reporter
+import unittest
+
+
+HERE = os.path.abspath(os.path.dirname(__file__))
+ROOT = os.path.abspath(os.path.join(HERE, '..'))
+EXCLUDE = [
+    # Migrations are automatically generated.
+    'migrations',
+    # TODO ev 2014-11-15 cupstream2distro is an understood mess.
+    'cupstream2distro',
+    # An arguably reasonable use of star imports.
+    'ticket_system/ticket/tests/__init__.py',
+]
+
+
+class TestSyntax(unittest.TestCase):
+    def test_pep8(self):
+        guide = pep8.StyleGuide(paths=[ROOT], exclude=EXCLUDE)
+        report = guide.check_files()
+        errors = report.total_errors
+        self.assertEqual(errors, 0, '%d PEP8 errors.' % errors)
+
+    def test_pyflakes(self):
+        (out, err) = (cStringIO.StringIO(), cStringIO.StringIO())
+        report = reporter.Reporter(out, err)
+        errors = 0
+        for dirpath, dirnames, filenames in os.walk(ROOT):
+            for filename in filenames:
+                path = os.path.join(dirpath, filename)
+                excluded = any(excl in path for excl in EXCLUDE)
+                if filename.endswith('.py') and not excluded:
+                    errors += api.checkPath(path, report)
+        error_text = out.getvalue()
+        if error_text:
+            print >>sys.stderr, '\n%s' % error_text
+        self.assertEqual(errors, 0, '%d pyflakes errors.' % errors)

=== modified file 'ticket_system/project/tests.py'
--- ticket_system/project/tests.py	2014-02-15 12:06:40 +0000
+++ ticket_system/project/tests.py	2014-11-25 17:16:49 +0000
@@ -168,18 +168,3 @@
     def test_delete_binarypackage_not_allowed(self):
         resp = self.delete(resource=self.detail_url)
         self.assertHttpMethodNotAllowed(resp)
-
-
-class TestPep8(styles.TestPep8):
-
-    packages = [project]
-    exclude = ['migrations/']
-
-
-class TestPyflakes(styles.TestPyflakes):
-
-    packages = [project]
-    # pyflakes dislikes 'from module import *'
-    excludes = ['project/tests/__init__.py',
-                # Ignore generated migrations files
-                'project/migrations/0001_initial.py']

=== removed file 'ticket_system/ticket/tests/test_style.py'
--- ticket_system/ticket/tests/test_style.py	2014-10-07 10:04:01 +0000
+++ ticket_system/ticket/tests/test_style.py	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-# Ubuntu CI Engine
-# Copyright 2014 Canonical Ltd.
-
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero 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 Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import os
-
-from ucitests import styles
-
-import ticket
-
-
-HERE = os.path.abspath(os.path.dirname(__file__))
-
-
-class TestPep8(styles.TestPep8):
-
-    packages = [ticket]
-    exclude = ['migrations/']
-
-
-class TestPyflakes(styles.TestPyflakes):
-
-    packages = [ticket]
-    migrations = ['ticket/migrations/' + x
-                  for x in os.listdir(os.path.join(HERE, '..', 'migrations'))]
-    # pyflakes dislikes 'from module import *'
-    excludes = ['ticket/tests/__init__.py'] + migrations

=== removed file 'validator/validator/tests/test_style.py'
--- validator/validator/tests/test_style.py	2014-08-12 13:51:42 +0000
+++ validator/validator/tests/test_style.py	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-# Ubuntu CI Engine
-# Copyright 2014 Canonical Ltd.
-
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero 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 Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import os
-from ucitests import styles
-
-import validator
-from testing import styles as testing_styles
-
-HERE = os.path.abspath(os.path.dirname(__file__))
-
-
-class TestPep8(styles.TestPep8):
-
-    packages = [validator]
-
-
-class TestPyflakes(styles.TestPyflakes):
-
-    packages = [validator]
-
-
-class TestPep8Bin(testing_styles.TestPep8):
-
-    directory = os.path.join(HERE, '..', '..', 'bin')
-
-
-class TestPyflakesBin(testing_styles.TestPyflakes):
-
-    directory = os.path.join(HERE, '..', '..', 'bin')

=== modified file 'webui/status/tests.py'
--- webui/status/tests.py	2014-07-23 13:31:29 +0000
+++ webui/status/tests.py	2014-11-25 17:16:49 +0000
@@ -90,11 +90,3 @@
         ]
         errors = _find_json_health_errors()
         self.assertEqual(2, len(errors))
-
-
-class TestPep8(styles.TestPep8):
-    packages = [status]
-
-
-class TestPyflakes(styles.TestPyflakes):
-    packages = [status]