Merge lp:~gz/juju-ci-tools/assess_jes_dump_logs into lp:juju-ci-tools

[Martin Packman]

Better logging for functional jes testing

Collects logs from hosted environments, and prints status before exiting.

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

=== modified file 'assess_jes_deploy.py'
--- assess_jes_deploy.py	2016-01-25 19:37:47 +0000
+++ assess_jes_deploy.py	2016-02-18 17:39:50 +0000
@@ -5,6 +5,7 @@
 import logging
 import sys
 from tempfile import NamedTemporaryFile
+import os
 
 import yaml
 
@@ -13,7 +14,9 @@
     check_token,
     configure_logging,
     deploy_dummy_stack,
+    dump_env_logs,
     get_random_string,
+    safe_print_status,
     )
 from jujupy import (
     EnvJujuClient,
@@ -34,15 +37,15 @@
     return hosted_env_client
 
 
-def test_jes_deploy(client, charm_prefix, base_env):
+def test_jes_deploy(client, charm_prefix, log_dir, base_env):
     """Deploy the dummy stack in two hosted environments."""
     # deploy into system env
     deploy_dummy_stack(client, charm_prefix)
 
     # deploy into hosted envs
-    with hosted_environment(client, 'env1') as env1_client:
+    with hosted_environment(client, log_dir, 'env1') as env1_client:
         deploy_dummy_stack(env1_client, charm_prefix)
-        with hosted_environment(client, 'env2') as env2_client:
+        with hosted_environment(client, log_dir, 'env2') as env2_client:
             deploy_dummy_stack(env2_client, charm_prefix)
             # check all the services can talk
             check_services(client)
@@ -89,7 +92,7 @@
 
 
 @contextmanager
-def hosted_environment(system_client, suffix):
+def hosted_environment(system_client, log_dir, suffix):
     client = make_hosted_env_client(system_client, suffix)
     try:
         with NamedTemporaryFile() as config_file:
@@ -104,7 +107,8 @@
                 client.env.environment))
         sys.exit(1)
     finally:
-        # TODO(gz): May want to gather logs from hosted env here.
+        safe_print_status(client)
+        dump_env_logs(client, None, os.path.join(log_dir, suffix))
         client.destroy_model()
 
 
@@ -120,7 +124,7 @@
     add_basic_testing_arguments(parser, using_jes=True)
     args = parser.parse_args()
     with jes_setup(args) as (client, charm_prefix, base_env):
-        test_jes_deploy(client, charm_prefix, base_env)
+        test_jes_deploy(client, charm_prefix, args.logs, base_env)
 
 
 if __name__ == '__main__':
 
=== modified file 'tests/test_assess_jes_deploy.py'
--- tests/test_assess_jes_deploy.py	2016-02-13 03:28:48 +0000
+++ tests/test_assess_jes_deploy.py	2016-02-18 17:39:50 +0000
@@ -1,5 +1,4 @@
 from argparse import Namespace
-import unittest
 from mock import (
     patch,
     )
@@ -17,10 +16,11 @@
     JUJU_DEV_FEATURE_FLAGS,
     SimpleEnvironment,
 )
+import tests
 from tests.test_jujupy import FakeJujuClient
 
 
-class TestJES(unittest.TestCase):
+class TestJES(tests.FakeHomeTestCase):
 
     client_class = EnvJujuClient25
 
@@ -154,11 +154,11 @@
         self.assertNotIn('jes', new_client.feature_flags)
 
 
-class TestHostedEnvironment(unittest.TestCase):
+class TestHostedEnvironment(tests.FakeHomeTestCase):
 
     def test_hosted_environment(self):
         hosting_client = FakeJujuClient()
-        with hosted_environment(hosting_client, 'bar') as client:
+        with hosted_environment(hosting_client, '/log', 'bar') as client:
             model_state = client._backing_state
             self.assertEqual({'name-bar': model_state},
                              hosting_client._backing_state.models)