Merge lp:~nskaggs/juju-ci-tools/add-essential-operations into lp:juju-ci-tools

[Nicholas Skaggs]

Refactor assess_heterogeneous_control.py into a standalone test. This is intended to test a single juju against a list of essential operations. It's intended to replace the deploy tests and many operations, and combine them into a single easy to run test. This test can also be "the test" for developers to run who want to do a quick verification of source builds of juju.

[lp:~nskaggs/juju-ci-tools/add-essential-operations]

1507. By Nicholas Skaggs on 2016-07-12

cleanups

1508. By Nicholas Skaggs on 2016-08-24

re-merge trunk

1509. By Nicholas Skaggs on 2016-08-24

+x

1510. By Nicholas Skaggs on 2016-08-24

restore missing merge

1511. By Nicholas Skaggs on 2016-08-24

spacing

Unmerged revisions

1511. By Nicholas Skaggs on 2016-08-24

spacing

1510. By Nicholas Skaggs on 2016-08-24

restore missing merge

1509. By Nicholas Skaggs on 2016-08-24

+x

1508. By Nicholas Skaggs on 2016-08-24

re-merge trunk

1507. By Nicholas Skaggs on 2016-07-12

cleanups

1506. By Nicholas Skaggs on 2016-07-12

basic idea complete

=== added file 'assess_essential_operations.py'
--- assess_essential_operations.py	1970-01-01 00:00:00 +0000
+++ assess_essential_operations.py	2016-08-24 19:22:12 +0000
@@ -0,0 +1,137 @@
+#!/usr/bin/env python
+"""This testsuite is intended to test essential juju operations. It is intended
+   to provide a basic testsuite against a given juju ensuring the most basic
+   and essential operations can be performed. It is useful for verifying an
+   unknown version of juju or a known version of juju against an unknown
+   substrate."""
+
+import argparse
+import logging
+import sys
+
+from jujucharm import (
+    local_charm_path,
+    )
+from jujupy import (
+    until_timeout,
+    )
+from deploy_stack import (
+    BootstrapManager,
+    deploy_dummy_stack,
+    )
+from utility import (
+    add_basic_testing_arguments,
+    configure_logging,
+    )
+from assess_heterogeneous_control import (
+    check_series,
+    has_agent,
+    nice_tear_down,
+    wait_until_removed,
+    )
+
+
+def test_expose_unexpose(client):
+    client.juju('unexpose', ('dummy-sink',))
+    if client.get_status().get_applications()['dummy-sink']['exposed']:
+        raise AssertionError('dummy-sink is still exposed')
+    client.juju('expose', ('dummy-sink',))
+    if client.get_status().get_applications()['dummy-sink']['unexposed']:
+        raise AssertionError('dummy-sink is still unexposed')
+
+
+def test_series(client, series):
+    check_series(series)
+
+
+def test_relations(client):
+    client.juju('remove-relation', ('dummy-source', 'dummy-sink'))
+    status = client.get_status()
+    relations = status.get_applications()['dummy-sink']['relations']
+    if relations['source'] == ['dummy-source']:
+        raise AssertionError('source is still dummy-source.')
+
+    client.juju('add-relation', ('dummy-source', 'dummy-sink'))
+    status = client.get_status()
+    relations = status.get_applications()['dummy-sink']['relations']
+    if not relations['source'] == ['dummy-source']:
+        raise AssertionError('source is not dummy-source.')
+
+
+def test_applications(client):
+    charm_path = local_charm_path(
+        charm='dummy-sink', juju_ver=client.version)
+    client.deploy(charm_path, service='sink2')
+    client.wait_for_started()
+
+    client.juju('add-relation', ('dummy-source', 'sink2'))
+    # status = client.get_status()
+    client.juju('expose', ('sink2',))
+    # status = client.get_status()
+    if 'sink2' not in client.get_status().get_applications():
+        raise AssertionError('Sink2 missing')
+    client.remove_service('sink2')
+    for ignored in until_timeout(30):
+        status = client.get_status()
+        if 'sink2' not in status.get_applications():
+            break
+    else:
+        raise AssertionError('Sink2 not destroyed')
+
+
+def test_units(client):
+    client.juju('add-unit', ('dummy-sink',))
+    if not has_agent(client, 'dummy-sink/1'):
+        raise AssertionError('dummy-sink/1 was not added.')
+    client.juju('remove-unit', ('dummy-sink/1',))
+    # status = client.get_status()
+    if has_agent(client, 'dummy-sink/1'):
+        raise AssertionError('dummy-sink/1 was not removed.')
+
+
+def test_machines(client):
+    container_type = client.preferred_container()
+    client.juju('add-machine', (container_type,))
+    status = client.get_status()
+    # TODO: missing assertion for creation of machine
+    container_machine, = set(k for k, v in status.agent_items() if
+                             k.endswith('/{}/0'.format(container_type)))
+    container_holder = container_machine.split('/')[0]
+    client.juju('remove-machine', (container_machine,))
+    wait_until_removed(client, container_machine)
+    client.juju('remove-machine', (container_holder,))
+    wait_until_removed(client, container_holder)
+
+
+def assess_essential_operations(client, series):
+    deploy_dummy_stack(client, series)
+    client.wait_for_started()
+
+    test_series(client, series)
+    test_relations(client)
+    test_expose_unexpose(client)
+    test_applications(client)
+    test_units(client)
+    test_machines(client)
+    nice_tear_down(client)
+
+
+def parse_args(argv):
+    """Parse all arguments."""
+    parser = argparse.ArgumentParser(
+        description="Test essential juju operations")
+    add_basic_testing_arguments(parser)
+    return parser.parse_args(argv)
+
+
+def main(argv=None):
+    args = parse_args(argv)
+    configure_logging(logging.DEBUG)
+    bs_manager = BootstrapManager.from_args(args)
+    with bs_manager.booted_context(args.upload_tools):
+        assess_essential_operations(bs_manager.client, bs_manager.series)
+    return 0
+
+
+if __name__ == '__main__':
+    sys.exit(main())

=== added file 'tests/test_assess_essential_operations.py'
--- tests/test_assess_essential_operations.py	1970-01-01 00:00:00 +0000
+++ tests/test_assess_essential_operations.py	2016-08-24 19:22:12 +0000
@@ -0,0 +1,86 @@
+"""Tests for assess_essential_operations module."""
+
+from argparse import Namespace
+import os
+import StringIO
+from unittest import TestCase
+
+from mock import (
+    MagicMock,
+    patch,
+    )
+
+from assess_essential_operations_control import (
+    assess_essential_operations,
+    check_series,
+    parse_args,
+    )
+from tests.test_deploy_stack import FakeBootstrapManager
+from tests.test_jujupy import (
+    fake_juju_client,
+    fake_juju_client_optional_jes,
+    )
+
+__metaclass__ = type
+
+
+class TestParseArgs(TestCase):
+
+    def test_parse_args(self):
+        args = parse_args(["an-env", "/bin/juju", "/tmp/logs", "an-env-mod"])
+        self.assertEqual("an-env", args.env)
+        self.assertEqual("/bin/juju", args.juju_bin)
+        self.assertEqual("/tmp/logs", args.logs)
+        self.assertEqual("an-env-mod", args.temp_env_name)
+        self.assertEqual(False, args.debug)
+
+    def test_help(self):
+        fake_stdout = StringIO.StringIO()
+        with parse_error(self) as fake_stderr:
+            with patch("sys.stdout", fake_stdout):
+                parse_args(["--help"])
+        self.assertEqual("", fake_stderr.getvalue())
+
+
+class TestAssessEssentialOperations(TestCase):
+
+    def test_assess_essential_operations(self):
+        client = fake_juju_client_optional_jes(jes_enabled=False)
+        bs_manager = FakeBootstrapManager(client)
+        # Prevent teardown
+        bs_manager.tear_down_client = MagicMock()
+        bs_manager.tear_down_client.destroy_environment.return_value = 0
+        with patch.object(client, 'kill_controller'):
+            assess_essential_operations(bs_manager, client, True)
+        models = client._backend.controller_state.models
+        model_state = models[client.model_name]
+        self.assertEqual(model_state.exposed, {'sink2', 'dummy-sink'})
+        self.assertEqual(model_state.machines, {'0', '1', '2'})
+        self.assertEqual(client.env.juju_home, 'foo')
+
+
+class TestCheckSeries(TestCase):
+
+    def test_check_series(self):
+        client = fake_juju_client()
+        client.bootstrap()
+        check_series(client)
+
+    def test_check_series_xenial(self):
+        client = MagicMock(spec=["get_juju_output"])
+        client.get_juju_output.return_value = "Codename:    xenial"
+        check_series(client, 1, 'xenial')
+
+    def test_check_series_calls(self):
+        client = MagicMock(spec=["get_juju_output"])
+        with patch.object(client, 'get_juju_output',
+                          return_value="Codename:   xenial") as gjo_mock:
+            check_series(client, 2, 'xenial')
+        gjo_mock.assert_called_once_with('ssh', 2, 'lsb_release', '-c')
+
+    def test_check_series_exceptionl(self):
+        client = fake_juju_client()
+        client.bootstrap()
+        with self.assertRaisesRegexp(
+                AssertionError, 'Series is angsty, not xenial'):
+            check_series(client, '0', 'xenial')

=== modified file 'tests/test_utility.py'
--- tests/test_utility.py	2016-08-12 20:55:16 +0000
+++ tests/test_utility.py	2016-08-24 19:22:12 +0000
@@ -30,6 +30,7 @@
     _find_candidates,
     find_candidates,
     find_latest_branch_candidates,
+    get_auth_token,
     get_candidates_path,
     get_deb_arch,
     get_winrm_certs,
@@ -100,6 +101,14 @@
             '<config><authToken>{}</authToken></config>'.format(token))
 
 
+class TestGetAuthToken(TestCase):
+
+    def test_get_auth_token(self):
+        with temp_dir() as root:
+            write_config(root, 'job-name', 'foo')
+            self.assertEqual(get_auth_token(root, 'job-name'), 'foo')
+
+
 class TestFindCandidates(TestCase):
 
     def test__find_candidates_artifacts_default(self):

=== modified file 'utility.py'
--- utility.py	2016-08-12 20:55:16 +0000
+++ utility.py	2016-08-24 19:22:12 +0000
@@ -18,6 +18,7 @@
     )
 from tempfile import mkdtemp
 import warnings
+import xml.etree.ElementTree as ET
 # Export shell quoting function which has moved in newer python versions
 try:
     from shlex import quote
@@ -248,6 +249,11 @@
     return result
 
 
+def get_auth_token(root, job):
+    tree = ET.parse(os.path.join(root, 'jobs', job, 'config.xml'))
+    return tree.getroot().find('authToken').text
+
+
 def check_free_disk_space(path, required, purpose):
     df_result = subprocess.check_output(["df", "-k", path])
     df_result = df_result.split('\n')[1]