Merge lp:~sseman/juju-ci-tools/client-server-concurrent into lp:juju-ci-tools

[Seman]

This branch splits scheduling the client-server tests into three jobs: compatibility-control, compatibility-control-osx and compatibility-control-windows.

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

=== modified file 'schedule_hetero_control.py'
--- schedule_hetero_control.py	2015-09-03 19:04:07 +0000
+++ schedule_hetero_control.py	2015-09-25 18:22:31 +0000
@@ -78,8 +78,11 @@
 def build_jobs(credentials, root, jobs):
     jenkins = Jenkins('http://localhost:8080', *credentials)
     token = get_auth_token(root, 'compatibility-control')
+    os_str = {"ubuntu": "", "osx": "-osx", "windows": "-windows"}
     for job in jobs:
-        jenkins.build_job('compatibility-control', job, token=token)
+        jenkins.build_job(
+            'compatibility-control{}'.format(os_str[job['client_os']]), job,
+            token=token)
 
 
 def main():

=== modified file 'tests/test_schedule_hetero_control.py'
--- tests/test_schedule_hetero_control.py	2015-09-22 22:41:12 +0000
+++ tests/test_schedule_hetero_control.py	2015-09-25 18:22:31 +0000
@@ -1,12 +1,17 @@
 from __future__ import print_function
 
+__metaclass__ = type
+
 from datetime import timedelta
 import json
 import os
 from time import time
 from unittest import TestCase
 
-from mock import patch
+from mock import (
+    call,
+    patch,
+)
 
 from jujuci import Credentials
 from schedule_hetero_control import (
@@ -20,9 +25,6 @@
 from test_utility import write_config
 
 
-__metaclass__ = type
-
-
 class TestScheduleHeteroControl(TestCase):
 
     def test_get_args_credentials(self):
@@ -56,6 +58,43 @@
             jenkins_mock.assert_called_once_with(
                 'http://localhost:8080', 'jrandom', 'password1')
 
+    def test_build_jobs(self):
+        credentials = Credentials('jrandom', 'password1')
+        jobs = []
+        for os_str in ('ubuntu', 'osx', 'windows'):
+            jobs.append({
+                'old_version': "1.18.4",
+                'candidate': "1.24.5",
+                'new_to_old': 'true',
+                'candidate_path': "1.24.5",
+                'client_os': os_str,
+                'revision_build': "2999"
+            })
+        calls = [
+            call('compatibility-control',
+                 {'candidate_path': '1.24.5', 'candidate': '1.24.5',
+                  'new_to_old': 'true', 'revision_build': '2999',
+                  'old_version': '1.18.4', 'client_os': 'ubuntu'},
+                 token='asdf'),
+            call('compatibility-control-osx',
+                 {'candidate_path': '1.24.5', 'candidate': '1.24.5',
+                  'new_to_old': 'true', 'revision_build': '2999',
+                  'old_version': '1.18.4', 'client_os': 'osx'}, token='asdf'),
+            call('compatibility-control-windows',
+                 {'candidate_path': '1.24.5', 'candidate': '1.24.5',
+                  'new_to_old': 'true', 'revision_build': '2999',
+                  'old_version': '1.18.4', 'client_os': 'windows'},
+                 token='asdf')]
+        with temp_dir() as root:
+            write_config(root, 'compatibility-control', 'asdf')
+            with patch('schedule_hetero_control.Jenkins',
+                       autospec=True) as jenkins_mock:
+                build_jobs(credentials, root, jobs)
+            jenkins_mock.assert_called_once_with(
+                'http://localhost:8080', 'jrandom', 'password1')
+            self.assertEqual(
+                jenkins_mock.return_value.build_job.call_args_list, calls)
+
 
 class TestGetCandidateInfo(TestCase):
     def test_get_candidate_info(self):