Merge lp:~cprov/uci-engine/tarmac-multienv into lp:uci-engine

[Celso Providelo]

Supporting multi-system deployment for tests.

Supporting multi-system deployment for tests.

`called-by-tarmac`.py was modified to deploy one or more systems before running the tests, it was done under the premise that system *can* co-exist on the same tenant, i.e common services will be shared (e.g. rabbit).

`DeployerTest` was extended to require an specific service, if not available the test is skipped. Existing integration tests were adjusted.

In order to test the feature a minimal 'ci-ubuntucore' configuration was created for deploying rabbit, TR and Apache. There is also an integration test checking that the apache is alive but not configured (:-/).

[lp:~cprov/uci-engine/tarmac-multienv]

926. By Celso Providelo on 2015-01-13

typo

[Francis Ginther (fginther)]

A novel way to solve the problem. Just have a question inline.

review: Needs Information

[Vincent Ladeuil (vila)]

Excellent !

I like the way this makes the test dependency purely declarative.

Only one minor nit inline otherwise, good to land.

review: Needs Fixing

[Celso Providelo (cprov)]

Thanks Francis and Vincent,

I've extended the base test class to fail if 'required_service' is not provided by client implementations, it will force us to write clearer tests.

Let's see if tarmac likes it too.

[lp:~cprov/uci-engine/tarmac-multienv]

927. By Celso Providelo on 2015-01-14

Addressing review comments, 'required_service' becomes mandatory for test implementations.

[Vincent Ladeuil (vila)]

\o/

review: Approve

=== modified file 'bin/called-by-tarmac.py'
--- bin/called-by-tarmac.py	2014-11-21 13:42:55 +0000
+++ bin/called-by-tarmac.py	2015-01-14 10:17:09 +0000
@@ -16,6 +16,14 @@
 sys.path.insert(0, os.path.join(HERE, '..'))
 from testing import venv
 
+# List of systems that should be deployed before running all tests.
+# It assumes the systems can co-exist under the same tenant, i.e.
+# common services will be shared (e.g. rabbit).
+testing_systems = (
+    'ci-airline',
+    'ci-ubuntucore',
+)
+
 
 def check_lxc_mounted():
     out = subprocess.check_output(['mount'])
@@ -61,6 +69,24 @@
     return True
 
 
+def deploy_testing_systems():
+    """Deploy 'testing_systems'.
+
+    Stops if `deploy.main()` failed for any specified system and returns
+    its 'return_code', otherwise returns ZERO.
+    """
+    # deploy.py isn't in our pythonpath when run as a script
+    sys.path.append(os.path.abspath('juju-deployer'))
+    import deploy
+
+    rc = 0
+    for name in testing_systems:
+        rc = deploy.main(['--name', name])
+        if rc != 0:
+            break
+    return rc
+
+
 def destroy_environment():
     '''Destroy the local environment. Return True if successful, False
     otherwise.'''
@@ -200,9 +226,6 @@
         raise
 
     from testing import run_tests
-    # deploy.py isn't in our pythonpath when run as a script
-    sys.path.append(os.path.abspath('juju-deployer'))
-    import deploy
 
     try:
         with open('/dev/null', 'w') as null:
@@ -221,7 +244,7 @@
     logging.info('Deploying.')
     t = time.time()
     # Bootstrap, then deploy.
-    if not bootstrap() or deploy.main() != 0:
+    if not bootstrap() or deploy_testing_systems() != 0:
         metrics.timing('counters.failures.deploy')
         return 1
     metrics.timing('deploy')

=== modified file 'juju-deployer/deploy.py'
--- juju-deployer/deploy.py	2015-01-06 18:41:34 +0000
+++ juju-deployer/deploy.py	2015-01-14 10:17:09 +0000
@@ -933,7 +933,7 @@
                         help='Build the deployment for --working-dir.')
     parser.add_argument('--name', default='ci-airline',
                         choices=('ci-airline', 'ci-airline-experimental',
-                                 'ci-airline-for-britney'),
+                                 'ci-airline-for-britney', 'ci-ubuntucore'),
                         help='''The name of the juju-deployer "stack".
                              Default=%(default)s''')
     parser.add_argument(
@@ -987,8 +987,8 @@
             bootstrap()
 
 
-def main():
-    args = _get_args()
+def main(args=None):
+    args = _get_args(args)
 
     # You can configure the system to use private PPAs only or by providing
     # the option --private-ppas-only or by setting the environment variable

=== modified file 'juju-deployer/relations.yaml'
--- juju-deployer/relations.yaml	2014-11-26 23:37:34 +0000
+++ juju-deployer/relations.yaml	2015-01-14 10:17:09 +0000
@@ -118,3 +118,6 @@
         - ["ci-airline-nfss-restish:pgsql", "ci-airline-nfss-postgres:db"]
         - ["ci-airline-nfss-apache:reverseproxy", "ci-airline-nfss-restish:website"]
         - ["ci-airline-nfss-apache", "ci-airline-nfss-content-fetcher"]
+
+ci-ubuntucore:
+    inherits: common

=== modified file 'juju-deployer/services.yaml.tmpl'
--- juju-deployer/services.yaml.tmpl	2015-01-06 18:41:34 +0000
+++ juju-deployer/services.yaml.tmpl	2015-01-14 10:17:09 +0000
@@ -417,3 +417,16 @@
         ci-airline-nfss-postgres:
             branch: lp:charms/trusty/postgresql@95
             charm: postgresql
+
+ci-ubuntucore:
+    series: precise
+    inherits: common
+    services:
+        ci-ubuntucore-webui-apache:
+            charm: apache2
+            constraints: "mem=1024M"
+            branch: lp:charms/precise/apache2@54
+            options:
+                enable_modules: "rewrite proxy proxy_http ssl"
+                servername: ci_ubuntu_core_webui_apache
+            expose: true

=== modified file 'tests/deployers.py'
--- tests/deployers.py	2014-11-06 13:40:54 +0000
+++ tests/deployers.py	2015-01-14 10:17:09 +0000
@@ -97,6 +97,24 @@
 class DeployerTest(testing.TestCaseWithGnupg):
     '''Base class for building juju deployer based tests.'''
 
+    required_service = None
+
+    def setUp(self):
+        """Check for 'required_service' availability."""
+        super(DeployerTest, self).setUp()
+        self.assertIsNotNone(
+            self.required_service,
+            "The test class should provide a 'self.required_service' to be "
+            "verified before running the tests.")
+        status = deploy.juju_status()
+        try:
+            units = status['services'][self.required_service]['units']
+            units['{}/0'.format(self.required_service)]
+        except KeyError:
+            self.skipTest(
+                'Required service {} not available'.format(
+                    self.required_service))
+
     def get_ip_and_port(self, service, unit=0):
         return juju_get_ip_and_port(service, unit)
 

=== modified file 'tests/test_britney.py'
--- tests/test_britney.py	2015-01-08 10:42:09 +0000
+++ tests/test_britney.py	2015-01-14 10:17:09 +0000
@@ -43,14 +43,6 @@
 )
 
 
-def requires_britney_deployment(test, status):
-    try:
-        br = status['services']['ci-airline-for-britney-requests']['units']
-        br['ci-airline-for-britney-requests/0']
-    except KeyError:
-        test.skipTest('Not a ci-airline-for-britney deployment')
-
-
 def get_rabbit_ip(status):
     units = status['services']['ci-airline-rabbit']['units']
     rabbit_ip = units['ci-airline-rabbit/0']['public-address']
@@ -59,6 +51,8 @@
 
 class TestProcessRequests(deployers.DeployerTest):
 
+    required_service = 'ci-airline-for-britney-requests'
+
     scenarios = scenarii.multiply_scenarios(
         # series
         ([('trusty', dict(series='trusty', result='PASSED')),
@@ -69,7 +63,6 @@
     def setUp(self):
         super(TestProcessRequests, self).setUp()
         status = deploy.juju_status()
-        requires_britney_deployment(self, status)
         deployers.expose_rabbit(self, get_rabbit_ip(status),
                                 'tester', 's3cr3t')
 
@@ -175,10 +168,11 @@
 
 class TestPost(deployers.DeployerTest):
 
+    required_service = 'ci-airline-for-britney-requests'
+
     def setUp(self):
         super(TestPost, self).setUp()
         status = deploy.juju_status()
-        requires_britney_deployment(self, status)
         fixtures.set_uniq_cwd(self)
         fixtures.isolate_from_env(self, dict(HOME=self.uniq_dir))
         units = status['services']['ci-airline-rabbit']['units']

=== modified file 'tests/test_bsbuilder.py'
--- tests/test_bsbuilder.py	2014-06-23 19:41:51 +0000
+++ tests/test_bsbuilder.py	2015-01-14 10:17:09 +0000
@@ -22,6 +22,8 @@
 class TestBsBuilder(deployers.DeployerTest):
     """Integration tests for bsbuilder service run on a juju deployment"""
 
+    required_service = 'ci-airline-bsb-worker'
+
     def test_worker_running(self):
         '''ensure the rabbit worker is deployed and running'''
         self.assert_job_running('ci-airline-bsb-worker')

=== modified file 'tests/test_image_builder.py'
--- tests/test_image_builder.py	2014-10-07 10:04:01 +0000
+++ tests/test_image_builder.py	2015-01-14 10:17:09 +0000
@@ -22,6 +22,8 @@
 class TestImageBuilder(deployers.DeployerTest):
     """Integration tests for image builder service run on a juju deployment"""
 
+    required_service = 'ci-airline-imagebuild-worker'
+
     def test_worker_running(self):
         '''ensure the rabbit worker is deployed and running'''
         self.assert_job_running('ci-airline-imagebuild-worker')

=== modified file 'tests/test_ppacreator.py'
--- tests/test_ppacreator.py	2014-10-30 20:46:10 +0000
+++ tests/test_ppacreator.py	2015-01-14 10:17:09 +0000
@@ -27,6 +27,8 @@
 class TestPPACreator(deployers.DeployerTest):
     """Integration tests for ppacreator service run on a juju deployment"""
 
+    required_service = 'ci-airline-ppa-creator-worker'
+
     def setUp(self):
         super(TestPPACreator, self).setUp()
         status = deploy.juju_status()

=== modified file 'tests/test_publisher.py'
--- tests/test_publisher.py	2014-10-07 10:04:01 +0000
+++ tests/test_publisher.py	2015-01-14 10:17:09 +0000
@@ -24,6 +24,8 @@
 class TestPublisher(deployers.DeployerTest):
     """Integration tests for publisher service run on a juju deployment"""
 
+    required_service = 'ci-airline-publisher-worker'
+
     def test_worker_running(self):
         """Ensure the publisher worker is deployed and running."""
         self.assert_job_running('ci-airline-publisher-worker')

=== modified file 'tests/test_rabbit.py'
--- tests/test_rabbit.py	2014-10-23 14:07:48 +0000
+++ tests/test_rabbit.py	2015-01-14 10:17:09 +0000
@@ -29,6 +29,8 @@
 @features.requires(features.bootstrapped_juju)
 class TestRabbit(deployers.DeployerTest):
 
+    required_service = RABBIT_SERVICE
+
     def setUp(self):
         super(TestRabbit, self).setUp()
         self.create_user('tester', 's3cr3t')

=== modified file 'tests/test_test_runner.py'
--- tests/test_test_runner.py	2015-01-09 11:24:30 +0000
+++ tests/test_test_runner.py	2015-01-14 10:17:09 +0000
@@ -33,6 +33,8 @@
 class SmokeTestTestRunner(deployers.DeployerTest):
     """Integration tests for test runner service run on a juju deployment"""
 
+    required_service = 'ci-airline-tr-rabbit-worker'
+
     def test_worker_running(self):
         '''Ensure the rabbit worker is deployed and running.'''
         # TODO ev 2014-06-16 We should really write status APIs that
@@ -42,6 +44,8 @@
 
 class TestTestRunner(deployers.DeployerTest):
 
+    required_service = 'ci-airline-tr-rabbit-worker'
+
     def setUp(self):
         super(TestTestRunner, self).setUp()
         status = deploy.juju_status()

=== modified file 'tests/test_ticket_system.py'
--- tests/test_ticket_system.py	2014-11-25 01:21:41 +0000
+++ tests/test_ticket_system.py	2015-01-14 10:17:09 +0000
@@ -24,12 +24,7 @@
 class TicketSystemTest(deployers.DeployerTest):
     """Integration tests for ticket-system service run on a juju deployment"""
 
-    def setUp(self):
-        super(TicketSystemTest, self).setUp()
-        # Adding get_ip_and_port('ts-django') in order to allow the deployment
-        # further time to settle before running the tests.
-        # http://pad.lv/1319077
-        self.get_ip_and_port('ci-airline-ts-django')
+    required_service = 'ci-airline-webui-apache'
 
     def get_server_status_and_content(self, url):
         """Issue an WebUI GET and return response and page content."""

=== modified file 'tests/test_validator.py'
--- tests/test_validator.py	2014-08-14 17:21:56 +0000
+++ tests/test_validator.py	2015-01-14 10:17:09 +0000
@@ -21,6 +21,8 @@
 class TestValidator(deployers.DeployerTest):
     """Integration tests for validator service."""
 
+    required_service = 'ci-airline-validator-worker'
+
     def test_worker_running(self):
         """Ensure the validator worker is deployed and running."""
         self.assert_job_running('ci-airline-validator-worker')

=== modified file 'tests/test_webui.py'
--- tests/test_webui.py	2015-01-09 13:27:24 +0000
+++ tests/test_webui.py	2015-01-14 10:17:09 +0000
@@ -50,8 +50,11 @@
     def setUp(self):
         """Sets browser base_url based on the available deployment."""
         super(WebUITest, self).setUp()
-        set_base_url('http://{}/'.format(
-            deployers.juju_get_ip_and_port('ci-airline-webui-apache')[0]))
+        try:
+            set_base_url('http://{}/'.format(
+                deployers.juju_get_ip_and_port('ci-airline-webui-apache')[0]))
+        except KeyError:
+            self.skipTest('WebUI not available')
         set_window_size(1280, 1024)
 
     def test_home(self):
@@ -535,5 +538,26 @@
         self.assertEqual('Engine health', active_link.text)
 
 
+class UbuntuCoreWebUITest(cases.SSTTestCase):
+
+    browser_factory = browsers.PhantomJSFactory()
+
+    def setUp(self):
+        """Sets browser base_url based on the available deployment."""
+        super(UbuntuCoreWebUITest, self).setUp()
+        try:
+            set_base_url('http://{}/'.format(
+                deployers.juju_get_ip_and_port(
+                    'ci-ubuntucore-webui-apache')[0]))
+        except KeyError:
+            self.skipTest('UbuntuCore WebUI not available')
+        set_window_size(1280, 1024)
+
+    def test_home(self):
+        # Placeholder test, since UbuntuCore apache is still unconfigured.
+        go_to('/')
+        assert_title('403 Forbidden')
+
+
 if __name__ == "__main__":
     unittest.main()