Merge lp:~sseman/juju-ci-tools/download-juju into lp:juju-ci-tools

[Seman]

This branch creates run_download_juju.py script. Using the Workspace Runner, it runs the download_juju.py script on the OS X and Windows machines.

Once this branch is approved, I will create a new Jenkins job called prepare-for-client-server-test. The job will execute this script (run_download_juju.py) and prepares the OS X and Widows machine for the client-server test by downloading all released and candidate Juju to the local file systems. When we run the client-server tests on OS X or Windows, we are going to assume the released and candidate Juju are already exist on local drive.

[John George (jog)]

Approve but I left one comment in-line suggesting you also test two additional calls made from main.

review: Approve

[lp:~sseman/juju-ci-tools/download-juju]

1097. By Seman on 2015-09-22

Added unit test.

=== added file 'run_download_juju.py'
--- run_download_juju.py	1970-01-01 00:00:00 +0000
+++ run_download_juju.py	2015-09-22 22:39:06 +0000
@@ -0,0 +1,70 @@
+#!/usr/bin/python
+from argparse import ArgumentParser
+import os
+from tempfile import NamedTemporaryFile
+import yaml
+
+from utility import run_command
+
+from schedule_hetero_control import get_candidate_info
+from utility import find_candidates
+
+
+def get_revisions(root_dir):
+    revisions = []
+    for candidate in find_candidates(root_dir):
+        _, rev = get_candidate_info(candidate)
+        revisions.append(rev)
+    return revisions
+
+
+def create_workspace_yaml(juju_home, script_path, stream, rev=None):
+    rev = '-c {}'.format(" ".join(rev)) if rev else ''
+    yl = {
+        "install": {
+            "cloud-city": [os.path.join(juju_home, 'ec2rc')]},
+        "command": [
+            "python",
+            script_path,
+            "cloud-city", "-r", "-v", rev]
+    }
+    yaml.safe_dump(yl, stream)
+
+
+def parse_args(args=None):
+    parser = ArgumentParser(
+        "Run download_juju script on the OS X and Windows machines.")
+    parser.add_argument('-o', '--osx-host',
+                        default='[e-mail]',
+                        help="OS X machine's username and hostname.")
+    parser.add_argument('-w', '--win-host',
+                        default='[e-mail]',
+                        help="Windows' username and hostname.")
+    parser.add_argument('-j', '--juju-home',
+                        default=os.environ.get('JUJU_HOME'),
+                        help="Juju home directory (cloud-city dir).")
+    parsed_args = parser.parse_args(args)
+    if parsed_args.juju_home is None:
+        parser.error(
+            'Invalid JUJU_HOME value: either set $JUJU_HOME env variable or '
+            'use --juju-home option to set the value.')
+
+    return parsed_args
+
+
+def main(argv=None):
+    args = parse_args(argv)
+    juju_home = args.juju_home
+    win_host = args.win_host
+    win_path = 'C:\\\Users\\\Administrator\\\juju-ci-tools\\\download_juju.py'
+    osx_path = '$HOME/juju-ci-tools/download_juju.py'
+    osx_host = args.osx_host
+    rev = get_revisions(os.environ['HOME'])
+    with NamedTemporaryFile() as temp_file:
+        for path, host in [[win_path, win_host], [osx_path, osx_host]]:
+            create_workspace_yaml(juju_home, path, temp_file, rev)
+            run_command(['workspace-run', temp_file.name, host])
+
+
+if __name__ == '__main__':
+    main()
 
=== added file 'test_run_download_juju.py'
--- test_run_download_juju.py	1970-01-01 00:00:00 +0000
+++ test_run_download_juju.py	2015-09-22 22:39:06 +0000
@@ -0,0 +1,144 @@
+from argparse import Namespace
+import os
+from tempfile import NamedTemporaryFile
+from unittest import TestCase
+
+from mock import patch, call
+
+from run_download_juju import (
+    create_workspace_yaml,
+    get_revisions,
+    parse_args,
+    main
+)
+from jujupy import ensure_dir
+from test_schedule_hetero_control import make_build_var_file
+from test_utility import parse_error
+from utility import temp_dir
+
+
+class TestGetCandidateInfo(TestCase):
+
+    def test_get_candidate_info(self):
+        with temp_dir() as dir_path:
+            candidate_dir = os.path.join(dir_path, 'candidate')
+            ensure_dir(candidate_dir)
+            for ver, rev in [['1.24.3', '2870'], ['1.24.5', '2999']]:
+                ver_dir = os.path.join(candidate_dir, ver)
+                ensure_dir(ver_dir)
+                make_build_var_file(ver_dir, version=ver, revision_build=rev)
+            rev = get_revisions(dir_path)
+        self.assertEqual(rev, ['2870', '2999'])
+
+    def test_create_workspace_yaml(self):
+        with NamedTemporaryFile() as temp_file:
+            create_workspace_yaml("/my/home", "/script/path", temp_file)
+            with open(temp_file.name) as yaml_file:
+                content = yaml_file.read()
+        self.assertEqual(content, self.expected())
+
+    def test_create_workspace_yaml_with_rev(self):
+        with NamedTemporaryFile() as temp_file:
+            create_workspace_yaml(
+                "/my/home", "/script/path", temp_file, ['2870', '2999'])
+            with open(temp_file.name) as yaml_file:
+                content = yaml_file.read()
+        self.assertEqual(content, self.expected('-c 2870 2999'))
+
+    def test_parse_args_default(self):
+        org = os.environ.get('JUJU_HOME')
+        os.environ['JUJU_HOME'] = '/juju/home'
+        args = parse_args([])
+        expected_args = Namespace(
+            osx_host='[e-mail]',
+            win_host='[e-mail]',
+            juju_home='/juju/home')
+        self.assertEqual(args, expected_args)
+        set_env('JUJU_HOME', org)
+
+    def test_parse_args(self):
+        args = parse_args(['-o', 'j@my-osx-host', '-w', 'j@my-win-host',
+                           '-j' '/juju/home'])
+        expected_args = Namespace(
+            osx_host='j@my-osx-host', win_host='j@my-win-host',
+            juju_home='/juju/home')
+        self.assertEqual(args, expected_args)
+
+    def test_parse_args_juju_home_unset(self):
+        org = del_env('JUJU_HOME')
+        with parse_error(self) as stderr:
+            parse_args([])
+        self.assertRegexpMatches(stderr.getvalue(), 'Invalid JUJU_HOME value')
+        if org:
+            set_env('JUJU_HOME', org)
+
+    def test_main(self):
+        org = os.environ.get('JUJU_HOME')
+        with temp_dir() as juju_home:
+            set_env('JUJU_HOME', juju_home)
+            temp_file = NamedTemporaryFile(delete=False)
+            with patch('run_download_juju.NamedTemporaryFile', autospec=True,
+                       return_value=temp_file) as ntf_mock:
+                with patch('subprocess.check_output') as sco_mock:
+                    main([])
+            calls = [
+                call(['workspace-run', temp_file.name,
+                      '[e-mail]']),
+                call(['workspace-run', temp_file.name,
+                      '[e-mail]'])]
+        set_env('JUJU_HOME', org)
+        self.assertEqual(sco_mock.call_args_list, calls)
+        ntf_mock.assert_called_once_with()
+
+    def test_main_expected_arguments(self):
+        org = os.environ.get('JUJU_HOME')
+        with temp_dir() as juju_home:
+            set_env('JUJU_HOME', juju_home)
+            temp_file = NamedTemporaryFile(delete=False)
+            with patch('run_download_juju.get_revisions',
+                       autospec=True) as gr_mock:
+                with patch('run_download_juju.create_workspace_yaml',
+                           autospec=True) as cwy_mock:
+                    with patch('run_download_juju.NamedTemporaryFile',
+                               autospec=True,
+                               return_value=temp_file) as ntf_mock:
+                        with patch('subprocess.check_output') as sco_mock:
+                            main([])
+            sco_calls = [
+                call(['workspace-run', temp_file.name,
+                      '[e-mail]']),
+                call(['workspace-run', temp_file.name,
+                      '[e-mail]'])]
+            cwy_calls = [
+                call(juju_home,
+                     ('C:\\\Users\\\Administrator\\\juju-ci-tools\\\download_'
+                      'juju.py'),
+                     temp_file, gr_mock.return_value),
+                call(juju_home, '$HOME/juju-ci-tools/download_juju.py',
+                     temp_file, gr_mock.return_value)]
+        set_env('JUJU_HOME', org)
+        self.assertEqual(sco_mock.call_args_list, sco_calls)
+        ntf_mock.assert_called_once_with()
+        gr_mock.assert_called_once_with(os.environ['HOME'])
+        self.assertEqual(cwy_mock.call_args_list, cwy_calls)
+
+    def expected(self, rev="''"):
+        return ("command: [python, /script/path, cloud-city, -r, -v, {}]\n"
+                "install:\n"
+                "  cloud-city: [/my/home/ec2rc]\n".format(rev))
+
+
+def del_env(key):
+    try:
+        org = os.environ[key]
+        del os.environ[key]
+    except KeyError:
+        org = None
+    return org
+
+
+def set_env(key, value):
+    if value is None:
+        del os.environ[key]
+    else:
+        os.environ[key] = value
 
=== modified file 'tests/test_schedule_hetero_control.py'
--- tests/test_schedule_hetero_control.py	2015-09-17 20:39:25 +0000
+++ tests/test_schedule_hetero_control.py	2015-09-22 22:39:06 +0000
@@ -122,8 +122,8 @@
         return jobs
 
 
-def make_build_var_file(dir_path, version):
-    build_vars = {"version": version, "revision_build": "2870"}
+def make_build_var_file(dir_path, version, revision_build="2870"):
+    build_vars = {"version": version, "revision_build": revision_build}
     file_path = os.path.join(dir_path, 'buildvars.json')
     with open(file_path, 'w') as json_file:
         json.dump(build_vars, json_file)