Merge lp:~sseman/juju-ci-tools/add-juju1x-to-multi-series into lp:juju-ci-tools

[Seman]

Juju version 1.25.5 supports list of series in the charm's metadata.yaml file. It pops the first series in list and use it as a default series.

This branch updates the assess_multi_series_charms to support Juju 1.X tests.

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

=== modified file 'assess_multi_series_charms.py'
--- assess_multi_series_charms.py	2016-04-15 16:59:14 +0000
+++ assess_multi_series_charms.py	2016-04-25 06:32:05 +0000
@@ -36,6 +36,7 @@
 import argparse
 from collections import namedtuple
 import logging
+import os
 import subprocess
 import sys
 
@@ -43,6 +44,7 @@
 from utility import (
     add_basic_testing_arguments,
     configure_logging,
+    local_charm_path,
     make_charm,
     temp_dir,
 )
@@ -55,7 +57,8 @@
 log = logging.getLogger("assess_multi_series_charms")
 
 
-Test = namedtuple("Test", ["series", "service", "force", "success", "machine"])
+Test = namedtuple("Test", ["series", "service", "force", "success", "machine",
+                           "juju1x_supported"])
 
 
 def assess_multi_series_charms(client):
@@ -67,28 +70,38 @@
     """
     tests = [
         Test(series="precise", service='test0', force=False, success=False,
-             machine=None),
+             machine=None, juju1x_supported=False),
         Test(series=None, service='test1', force=False, success=True,
-             machine='0'),
+             machine='0', juju1x_supported=True),
         Test(series="trusty", service='test2', force=False, success=True,
-             machine='1'),
+             machine='1', juju1x_supported=True),
         Test(series="xenial", service='test3', force=False, success=True,
-             machine='2'),
+             machine='2', juju1x_supported=False),
         Test(series="precise", service='test4', force=True, success=True,
-             machine='3'),
+             machine='3', juju1x_supported=False),
     ]
-    with temp_dir() as charm_dir:
-        make_charm(charm_dir, series=['trusty', 'xenial'])
+    with temp_dir() as repository:
+        charm_name = 'dummy'
+        charm_dir = os.path.join(repository, 'trusty', charm_name)
+        os.makedirs(charm_dir)
+        make_charm(
+            charm_dir, min_ver=None, series=['trusty', 'xenial'],
+            name=charm_name)
+        charm_path = local_charm_path(
+            charm=charm_name, juju_ver=client.version, series='trusty',
+            repository=os.path.dirname(charm_dir))
         for test in tests:
+            if client.is_juju1x() and not test.juju1x_supported:
+                continue
             log.info(
                 "Assessing multi series charms: test: {} charm_dir:{}".format(
-                    test, charm_dir))
-            assert_deploy(client, test, charm_dir)
+                    test, charm_path))
+            assert_deploy(client, test, charm_path, repository=repository)
             if test.machine:
                 check_series(client, machine=test.machine, series=test.series)
 
 
-def assert_deploy(client, test, charm_dir):
+def assert_deploy(client, test, charm_path, repository=None):
     """Deploy a charm and assert a success or fail.
 
     :param client: Juju client
@@ -97,16 +110,20 @@
     :type  test: Test
     :param charm_dir:
     :type charm_dir: str
+    :param repository: Direcotry path to the repository
+    :type repository: str
     :return: None
     """
     if test.success:
-        client.deploy(charm=charm_dir, series=test.series,
-                      service=test.service, force=test.force)
+        client.deploy(charm=charm_path, series=test.series,
+                      service=test.service, force=test.force,
+                      repository=repository)
         client.wait_for_started()
     else:
         try:
-            client.deploy(charm=charm_dir, series=test.series,
-                          service=test.service, force=test.force)
+            client.deploy(charm=charm_path, series=test.series,
+                          service=test.service, force=test.force,
+                          repository=repository)
         except subprocess.CalledProcessError:
             return
         raise JujuAssertionError('Assert deploy failed for {}'.format(test))

=== modified file 'jujupy.py'
--- jujupy.py	2016-04-21 22:09:04 +0000
+++ jujupy.py	2016-04-25 06:32:05 +0000
@@ -1114,6 +1114,9 @@
     def add_subnet(self, subnet, space):
         self.juju('add-subnet', (subnet, space))
 
+    def is_juju1x(self):
+        return self.version.startswith('1.')
+
 
 class EnvJujuClient2B2(EnvJujuClient):
 

=== modified file 'tests/test_assess_multi_series_charms.py'
--- tests/test_assess_multi_series_charms.py	2016-04-14 19:29:39 +0000
+++ tests/test_assess_multi_series_charms.py	2016-04-25 06:32:05 +0000
@@ -6,6 +6,7 @@
     Mock,
     patch,
 )
+import os
 import StringIO
 import subprocess
 
@@ -71,7 +72,10 @@
 
     def test_assess_multi_series_charms(self):
         mock_client = Mock(
-            spec=["deploy", "get_juju_output", "wait_for_started"])
+            spec=["deploy", "get_juju_output", "wait_for_started",
+                  "is_juju1x"])
+        mock_client.version = '2.0.0'
+        mock_client.is_juju1x.return_value = False
         mock_client.get_juju_output.return_value = "Codename:	trusty"
         mock_client.deploy.side_effect = [
             subprocess.CalledProcessError(None, None),
@@ -88,16 +92,18 @@
                            autospec=True) as cs_mock:
                     assess_multi_series_charms(mock_client)
         self.assertEqual(mock_client.wait_for_started.call_count, 4)
+        charm = os.path.join(charm_dir, 'trusty', 'dummy')
         calls = [
-            call(charm=charm_dir, force=False, series='precise',
-                 service='test0'),
-            call(charm=charm_dir, force=False, series=None, service='test1'),
-            call(charm=charm_dir, force=False, series='trusty',
-                 service='test2'),
-            call(charm=charm_dir, force=False, series='xenial',
-                 service='test3'),
-            call(charm=charm_dir, force=True, series='precise',
-                 service='test4')
+            call(charm=charm, force=False, repository=charm_dir,
+                 series='precise', service='test0'),
+            call(charm=charm, force=False, repository=charm_dir,
+                 series=None, service='test1'),
+            call(charm=charm, force=False, repository=charm_dir,
+                 series='trusty', service='test2'),
+            call(charm=charm, force=False, repository=charm_dir,
+                 series='xenial', service='test3'),
+            call(charm=charm, force=True, repository=charm_dir,
+                 series='precise', service='test4')
         ]
         self.assertEqual(mock_client.deploy.mock_calls, calls)
         td_mock.assert_called_once_with()
@@ -108,33 +114,66 @@
             call(mock_client, machine='3', series='precise')]
         self.assertEqual(cs_mock.mock_calls, cs_calls)
 
+    def test_assess_multi_series_charms_juju1x(self):
+        mock_client = Mock(
+            spec=[
+                "deploy", "get_juju_output", "wait_for_started", "is_juju1x"])
+        mock_client.version = '1.25.5'
+        mock_client.is_juju1x.return_value = True
+        mock_client.get_juju_output.return_value = "Codename:	trusty"
+        mock_client.deploy.return_value = None
+        with temp_dir() as charm_dir:
+            with patch('assess_multi_series_charms.temp_dir',
+                       autospec=True) as td_mock:
+                td_mock.return_value.__enter__.return_value = charm_dir
+                with patch('assess_multi_series_charms.check_series',
+                           autospec=True) as cs_mock:
+                    assess_multi_series_charms(mock_client)
+        self.assertEqual(mock_client.wait_for_started.call_count, 2)
+        charm = os.path.join('local:trusty', 'dummy')
+        calls = [
+            call(charm=charm, force=False, repository=charm_dir,
+                 series=None, service='test1'),
+            call(charm=charm, force=False, repository=charm_dir,
+                 series='trusty', service='test2')
+        ]
+        self.assertEqual(mock_client.deploy.mock_calls, calls)
+        td_mock.assert_called_once_with()
+        cs_calls = [
+            call(mock_client, machine='0', series=None),
+            call(mock_client, machine='1', series='trusty')]
+        self.assertEqual(cs_mock.mock_calls, cs_calls)
+
     def test_assert_deploy(self):
         test = Test(series='trusty', service='test1', force=False,
-                    success=True, machine='0')
+                    success=True, machine='0', juju1x_supported=False)
         mock_client = Mock(
             spec=["deploy", "get_juju_output", "wait_for_started"])
         assert_deploy(mock_client, test, '/tmp/foo')
         mock_client.deploy.assert_called_once_with(
-            charm='/tmp/foo', force=False, series='trusty', service='test1')
+            charm='/tmp/foo', force=False, repository=None, series='trusty',
+            service='test1')
 
     def test_assert_deploy_success_false(self):
         test = Test(series='trusty', service='test1', force=False,
-                    success=False, machine='0')
+                    success=False, machine='0',  juju1x_supported=False)
         mock_client = Mock(
             spec=["deploy", "get_juju_output", "wait_for_started"])
         mock_client.deploy.side_effect = subprocess.CalledProcessError(
             None, None)
         assert_deploy(mock_client, test, '/tmp/foo')
         mock_client.deploy.assert_called_once_with(
-            charm='/tmp/foo', force=False, series='trusty', service='test1')
+            charm='/tmp/foo', force=False, repository=None, series='trusty',
+            service='test1')
 
     def test_assert_deploy_success_false_raises_exception(self):
         test = Test(series='trusty', service='test1', force=False,
-                    success=False, machine='0')
+                    success=False, machine='0',  juju1x_supported=False)
         mock_client = Mock(
             spec=["deploy", "get_juju_output", "wait_for_started"])
         with self.assertRaisesRegexp(
                 JujuAssertionError, 'Assert deploy failed for'):
             assert_deploy(mock_client, test, '/tmp/foo')
         mock_client.deploy.assert_called_once_with(
-            charm='/tmp/foo', force=False, series='trusty', service='test1')
+            charm='/tmp/foo', force=False, repository=None, series='trusty',
+            service='test1')

=== modified file 'tests/test_jujupy.py'
--- tests/test_jujupy.py	2016-04-22 04:14:41 +0000
+++ tests/test_jujupy.py	2016-04-25 06:32:05 +0000
@@ -2806,6 +2806,14 @@
             client.enable_feature('nomongo')
         self.assertEqual(str(ctx.exception), "Unknown feature flag: 'nomongo'")
 
+    def test_is_juju1x(self):
+        client = EnvJujuClient(None, '1.25.5', None)
+        self.assertTrue(client.is_juju1x())
+
+    def test_is_juju1x_false(self):
+        client = EnvJujuClient(None, '2.0.0', None)
+        self.assertFalse(client.is_juju1x())
+
 
 class TestEnvJujuClient2B2(ClientTest):