Merge lp:~ev/uci-engine/directory-reorg into lp:uci-engine

[Evan]

Split apart tests/ into integration and projects directories. Opportunistically pick up tests under bin/.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:905
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~ev/uci-engine/directory-reorg/+merge/242797/+edit-commit-message

http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/1746/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/1746/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

905. By Evan on 2014-11-25

Add the project and bin tests to the orphan group in run-tests.

904. By Evan on 2014-11-25

Factor out style tests.

903. By Evan on 2014-11-25

Merge with guard-against-breaking-virtualenvs branch.

902. By Evan on 2014-11-25

Split apart tests directory into integration and project tests.

=== 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 15:45:34 +0000
@@ -29,7 +29,7 @@
 sys.path.insert(0, BRANCH_ROOT)
 
 
-from tests import deployers
+from testing import deployers
 
 
 def main(args):

=== 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 15:45:34 +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

=== 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 15:45:34 +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 15:45:34 +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 15:45:34 +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 15:45:34 +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 15:45:34 +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 15:45:34 +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

=== added file 'tests/integration/test_style.py'
--- tests/integration/test_style.py	1970-01-01 00:00:00 +0000
+++ tests/integration/test_style.py	2014-11-25 15:45:34 +0000
@@ -0,0 +1,45 @@
+# 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
+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'))

=== 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 15:45:34 +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 15:45:34 +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 15:45:34 +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 15:45:34 +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-25 15:45:34 +0000
+++ tests/project/test_static.py	2014-11-25 15:45:34 +0000
@@ -18,34 +18,6 @@
 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 TestStatic(unittest.TestCase):
 
     def test_no_bare_exit(self):

=== added file 'tests/project/test_style.py'
--- tests/project/test_style.py	1970-01-01 00:00:00 +0000
+++ tests/project/test_style.py	2014-11-25 15:45:34 +0000
@@ -0,0 +1,45 @@
+# 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
+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'))