Merge lp:~nskaggs/juju-ci-tools/update-templates into lp:juju-ci-tools

[Nicholas Skaggs]

Update templates for new ci tests

[Martin Packman (gz)]

See inline comments for design suggestions and changes.

[lp:~nskaggs/juju-ci-tools/update-templates]

1339. By Nicholas Skaggs on 2016-04-01

flake8 fixes

1340. By Nicholas Skaggs on 2016-04-01

kill current version, fix make_charm, move to jujupy

[Nicholas Skaggs (nskaggs)]

Per Aaron, I'm tabling for now based on feedback. This takes the template away from the current decision to host a repository of charms, and changes how we view charms as needing 1.x and 2.x compatibility.

review: Disapprove

Unmerged revisions

1340. By Nicholas Skaggs on 2016-04-01

kill current version, fix make_charm, move to jujupy

1339. By Nicholas Skaggs on 2016-04-01

flake8 fixes

1338. By Nicholas Skaggs on 2016-04-01

only one more test hates me

1337. By Nicholas Skaggs on 2016-04-01

wip, fix unit tests

1336. By Nicholas Skaggs on 2016-03-31

add support for juju 1 and juju 2

1335. By Nicholas Skaggs on 2016-03-31

whitespace

1334. By Nicholas Skaggs on 2016-03-31

Update templates to be 2.0ish with xenial and dummy charm

=== modified file 'jujupy.py'
--- jujupy.py	2016-03-24 13:45:50 +0000
+++ jujupy.py	2016-04-01 21:59:37 +0000
@@ -1102,6 +1102,21 @@
     def add_subnet(self, subnet, space):
         self.juju('add-subnet', (subnet, space))
 
+    # nas make charm_dir sane default of temp dir
+    # allow name to also be sane temporary default
+    def make_charm(charm_dir, name, summary=None,
+                   description=None, series=[],
+                   min_juju_version=None):
+        metadata = os.path.join(charm_dir, 'metadata.yaml')
+        content = {}
+        content['name'] = name
+        content['summary'] = summary
+        content['description'] = description
+        content['min-juju-version'] = min_juju_version
+        content['series'] = series
+        with open(metadata, 'w') as f:
+            yaml.safe_dump(content, f, default_flow_style=False)
+
 
 class EnvJujuClient2B2(EnvJujuClient):
 
 
=== modified file 'template_assess.py.tmpl'
--- template_assess.py.tmpl	2016-03-21 21:04:42 +0000
+++ template_assess.py.tmpl	2016-04-01 21:59:37 +0000
@@ -5,30 +5,44 @@
 
 import argparse
 import logging
+import os
 import sys
 
+import yaml
+
 from deploy_stack import (
     BootstrapManager,
 )
 from utility import (
     add_basic_testing_arguments,
     configure_logging,
+    temp_dir,
 )
 
-
 __metaclass__ = type
 
-
 log = logging.getLogger("assess_TEMPLATE")
 
-
-def assess_TEMPLATE(client):
+def assess_TEMPLATE(client, args):
     # Deploy charms, there are several under ./repository
-    client.juju("deploy", ('local:trusty/my-charm',))
-    # Wait for the deployment to finish.
-    client.wait_for_started()
-    log.info("TODO: Add log line about any test")
-    # TODO: Add specific functional testing actions here.
+    if get_current_version(client, args.juju_bin).startswith('1.'):
+        log.info("Testing TEMPLATE")
+        charm_name = 'dummy'
+        make_charm(charm_dir, charm_name)
+        client.deploy('local:' + charm_name)
+        # Wait for the deployment to finish.
+        client.wait_for_started()
+        log.info("TODO: Add log line about any test")
+        # TODO: Add specific functional testing actions here.
+    else:
+        with temp_dir() as charm_dir:
+            log.info("Testing TEMPLATE")
+            make_charm(charm_dir)
+            client.deploy(charm)
+            # Wait for the deployment to finish.
+            client.wait_for_started()
+            log.info("TODO: Add log line about any test")
+            # TODO: Add specific functional testing actions here.
 
 
 def parse_args(argv):
@@ -45,9 +59,8 @@
     configure_logging(args.verbose)
     bs_manager = BootstrapManager.from_args(args)
     with bs_manager.booted_context(args.upload_tools):
-        assess_TEMPLATE(bs_manager.client)
+        assess_TEMPLATE(bs_manager.client, args)
     return 0
 
-
 if __name__ == '__main__':
     sys.exit(main())
 
=== modified file 'template_test.py.tmpl'
--- template_test.py.tmpl	2015-12-16 03:59:38 +0000
+++ template_test.py.tmpl	2016-04-01 21:59:37 +0000
@@ -1,18 +1,28 @@
 """Tests for assess_TEMPLATE module."""
 
 import logging
-from mock import Mock, patch
+from mock import (
+    Mock,
+    patch,
+    call,
+)
+import os
 import StringIO
 
+import yaml
+
 from assess_TEMPLATE import (
     assess_TEMPLATE,
+    get_current_version,
+    make_charm,
+    main,
     parse_args,
-    main,
 )
 from tests import (
     parse_error,
     TestCase,
 )
+from utility import temp_dir
 
 
 class TestParseArgs(TestCase):
@@ -55,15 +65,25 @@
         mock_e.assert_called_once_with("an-env")
         mock_c.assert_called_once_with(env, "/bin/juju", debug=False)
         self.assertEqual(mock_bc.call_count, 1)
-        mock_assess.assert_called_once_with(client)
+        mock_assess.assert_called_once_with(client, parse_args(argv))
 
 
 class TestAssess(TestCase):
 
-    def test_TEMPLATE(self):
+    def test_assess_TEMPLATE(self):
+        argv = ["an-env", "/bin/juju", "/tmp/logs", "an-env-mod", "--verbose"]
+        args = parse_args(argv)
         mock_client = Mock(spec=["juju", "wait_for_started"])
-        assess_TEMPLATE(mock_client)
-        mock_client.juju.assert_called_once_with(
-            'deploy', ('local:trusty/my-charm',))
+        with patch("assess_TEMPLATE.get_current_version",
+                   autospec=True, return_value="2.0.0") as mock_gcv:
+            with patch("assess_TEMPLATE.temp_dir",
+                       autospec=True) as mock_td:
+                with patch("assess_TEMPLATE.make_charm",
+                           autospec=True) as mock_mc:
+                    assess_TEMPLATE(mock_client, args)
         mock_client.wait_for_started.assert_called_once_with()
+        mock_gcv.assert_called_once_with(mock_client, '/bin/juju')
+        temp_dir = mock_td.return_value.__enter__.return_value
+        call(mock_client, temp_dir)
+        self.assertEqual(mock_td.call_count, 1)
         self.assertNotIn("TODO", self.log_stream.getvalue())
 
=== modified file 'tests/test_jujupy.py'
--- tests/test_jujupy.py	2016-03-24 13:45:50 +0000
+++ tests/test_jujupy.py	2016-04-01 21:59:37 +0000
@@ -2603,6 +2603,14 @@
         juju_mock.assert_called_once_with('add-subnet',
                                           ('bar-subnet', 'foo-space'))
 
+    def test_make_charm(self):
+        client = EnvJujuClient(JujuData(None, {'type': 'local'}),
+                               '1.23-series-arch', None)
+        with patch.object(client, 'juju', autospec=True) as juju_mock:
+            client.make_charm('/tmp/make-charm', 'foo')
+        juju_mock.assert_called_once_with('make-charm',
+                                          ('/tmp/make-charm', 'foo'))
+
     def test__shell_environ_uses_pathsep(self):
         client = EnvJujuClient(JujuData('foo'), None, 'foo/bar/juju')
         with patch('os.pathsep', '!'):