Merge lp:~sinzui/juju-ci-tools/modern-charm-series into lp:juju-ci-tools

[Curtis Hovey]

Use reasonable series in multi-series charm test.

The multi-series charm tests are failing because they are trying to deploy precise, which we no longer make agents for. This branch updates the test to use living series. The --force scenario for charms is most likely to happen for ubuntu devel series. I added a --devel-series arg that will be used for the devel series. I intend to pass zesty to verify it works.

I removed some extra space noted by lint.

[Aaron Bentley (abentley)]

review: Approve

=== modified file 'assess_multi_series_charms.py'
--- assess_multi_series_charms.py	2017-01-20 20:39:27 +0000
+++ assess_multi_series_charms.py	2017-04-07 16:33:43 +0000
@@ -11,9 +11,9 @@
     summary: "Great software"
     description: It works
     series:
+       - xenial
        - trusty
-       - precise
-       - wily
+       - angsty
 
 The default series is the first in the list:
 
@@ -23,12 +23,12 @@
 
 A different, non-default series may be specified:
 
-    juju deploy mycharm --series precise
+    juju deploy mycharm --series xenial
 
 It is possible to force the charm to deploy using an unsupported series
 (so long as the underlying OS is compatible):
 
-    juju deploy mycharm --series xenial --force
+    juju deploy mycharm --series angsty --force
 
 """
 from __future__ import print_function
@@ -63,15 +63,16 @@
                            "juju1x_supported"])
 
 
-def assess_multi_series_charms(client):
+def assess_multi_series_charms(client, devel_series):
     """Assess multi series charms.
 
     :param client: Juju client.
+    :param devel_series: The series to use for new and unsupported scenarios.
     :type client: jujupy.ModelClient
     :return: None
     """
     tests = [
-        Test(series="precise", service='test0', force=False, success=False,
+        Test(series="xenial", service='test0', force=False, success=False,
              machine=None, juju1x_supported=False),
         Test(series=None, service='test1', force=False, success=True,
              machine='0', juju1x_supported=True),
@@ -79,7 +80,7 @@
              machine='1', juju1x_supported=True),
         Test(series="xenial", service='test3', force=False, success=True,
              machine='2', juju1x_supported=False),
-        Test(series="precise", service='test4', force=True, success=True,
+        Test(series=devel_series, service='test4', force=True, success=True,
              machine='3', juju1x_supported=False),
     ]
     with temp_dir() as repository:
@@ -133,6 +134,9 @@
     parser = argparse.ArgumentParser(
         description="Test multi series charm feature")
     add_basic_testing_arguments(parser)
+    parser.add_argument(
+        '--devel-series', default="xenial",
+        help="The series to use when testing new and unsupported scenarios.")
     return parser.parse_args(argv)
 
 
@@ -141,7 +145,7 @@
     configure_logging(args.verbose)
     bs_manager = BootstrapManager.from_args(args)
     with bs_manager.booted_context(args.upload_tools):
-        assess_multi_series_charms(bs_manager.client)
+        assess_multi_series_charms(bs_manager.client, args.devel_series)
     return 0
 
 

=== modified file 'tests/test_assess_multi_series_charms.py'
--- tests/test_assess_multi_series_charms.py	2016-09-20 14:19:15 +0000
+++ tests/test_assess_multi_series_charms.py	2017-04-07 16:33:43 +0000
@@ -47,7 +47,8 @@
 
 class TestMain(TestCase):
     def test_main(self):
-        argv = ["an-env", "/bin/juju", "/tmp/logs", "an-env-mod", "--verbose"]
+        argv = ["an-env", "/bin/juju", "/tmp/logs", "an-env-mod",
+                "--verbose", '--devel-series', 'angsty']
         client = Mock(spec=["is_jes_enabled"])
         with patch("assess_multi_series_charms.configure_logging",
                    autospec=True) as mock_cl:
@@ -64,7 +65,7 @@
         mock_c.assert_called_once_with('an-env', "/bin/juju", debug=False,
                                        soft_deadline=None)
         self.assertEqual(mock_bc.call_count, 1)
-        mock_assess.assert_called_once_with(client)
+        mock_assess.assert_called_once_with(client, 'angsty')
 
 
 class TestAssess(TestCase):
@@ -89,12 +90,12 @@
                 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)
+                    assess_multi_series_charms(mock_client, 'angsty')
         self.assertEqual(mock_client.wait_for_started.call_count, 4)
         charm = os.path.join(charm_dir, 'trusty', 'dummy')
         calls = [
             call(charm=charm, force=False, repository=charm_dir,
-                 series='precise', service='test0'),
+                 series='xenial', service='test0'),
             call(charm=charm, force=False, repository=charm_dir,
                  series=None, service='test1'),
             call(charm=charm, force=False, repository=charm_dir,
@@ -102,7 +103,7 @@
             call(charm=charm, force=False, repository=charm_dir,
                  series='xenial', service='test3'),
             call(charm=charm, force=True, repository=charm_dir,
-                 series='precise', service='test4')
+                 series='angsty', service='test4')
         ]
         self.assertEqual(mock_client.deploy.mock_calls, calls)
         td_mock.assert_called_once_with()
@@ -110,7 +111,7 @@
             call(mock_client, machine='0', series=None),
             call(mock_client, machine='1', series='trusty'),
             call(mock_client, machine='2', series='xenial'),
-            call(mock_client, machine='3', series='precise')]
+            call(mock_client, machine='3', series='angsty')]
         self.assertEqual(cs_mock.mock_calls, cs_calls)
 
     def test_assess_multi_series_charms_juju1x(self):
@@ -127,7 +128,7 @@
                 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)
+                    assess_multi_series_charms(mock_client, 'angsty')
         self.assertEqual(mock_client.wait_for_started.call_count, 2)
         charm = os.path.join('local:trusty', 'dummy')
         calls = [
@@ -155,7 +156,7 @@
 
     def test_assert_deploy_success_false(self):
         test = Test(series='trusty', service='test1', force=False,
-                    success=False, machine='0',  juju1x_supported=False)
+                    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(
@@ -167,7 +168,7 @@
 
     def test_assert_deploy_success_false_raises_exception(self):
         test = Test(series='trusty', service='test1', force=False,
-                    success=False, machine='0',  juju1x_supported=False)
+                    success=False, machine='0', juju1x_supported=False)
         mock_client = Mock(
             spec=["deploy", "get_juju_output", "wait_for_started"])
         with self.assertRaisesRegexp(