~nskaggs/juju-ci-tools/add-assess-terms

« back to all changes in this revision

Viewing changes to tests/test_schedule_hetero_control.py

  • Committer: Curtis Hovey
  • Date: 2016-08-12 20:55:16 UTC
  • mto: This revision was merged to the branch mainline in revision 1551.
  • Revision ID: curtis@canonical.com-20160812205516-of5u0z428zui2qme
Removed get_toekn; all jobs require authentication anyway.

Show diffs side-by-side

added added

removed removed

Lines of Context:
57
57
                       autospec=True) as jenkins_mock:
58
58
                build_jobs(credentials, root, [])
59
59
            jenkins_mock.assert_called_once_with(
60
 
                'http://localhost:8080', 'jrandom', 'password1')
 
60
                'http://juju-ci.vapour.ws:8080', 'jrandom', 'password1')
61
61
 
62
62
    def test_build_jobs(self):
63
63
        credentials = Credentials('jrandom', 'password1')
75
75
            call('compatibility-control',
76
76
                 {'candidate_path': '1.24.5', 'candidate': '1.24.5',
77
77
                  'new_to_old': 'true', 'revision_build': '2999',
78
 
                  'old_version': '1.18.4', 'client_os': 'ubuntu'},
79
 
                 token='asdf'),
 
78
                  'old_version': '1.18.4', 'client_os': 'ubuntu'}),
80
79
            call('compatibility-control-osx',
81
80
                 {'candidate_path': '1.24.5', 'candidate': '1.24.5',
82
81
                  'new_to_old': 'true', 'revision_build': '2999',
83
 
                  'old_version': '1.18.4', 'client_os': 'osx'}, token='asdf'),
 
82
                  'old_version': '1.18.4', 'client_os': 'osx'}),
84
83
            call('compatibility-control-windows',
85
84
                 {'candidate_path': '1.24.5', 'candidate': '1.24.5',
86
85
                  'new_to_old': 'true', 'revision_build': '2999',
87
 
                  'old_version': '1.18.4', 'client_os': 'windows'},
88
 
                 token='asdf')]
 
86
                  'old_version': '1.18.4', 'client_os': 'windows'})]
89
87
        with temp_dir() as root:
90
88
            write_config(root, 'compatibility-control', 'asdf')
91
89
            with patch('schedule_hetero_control.Jenkins',
92
90
                       autospec=True) as jenkins_mock:
93
91
                build_jobs(credentials, root, jobs)
94
92
            jenkins_mock.assert_called_once_with(
95
 
                'http://localhost:8080', 'jrandom', 'password1')
 
93
                'http://juju-ci.vapour.ws:8080', 'jrandom', 'password1')
96
94
            self.assertEqual(
97
95
                jenkins_mock.return_value.build_job.call_args_list, calls)
98
96
 
172
170
            os.makedirs(candidate_path_2)
173
171
            make_build_var_file(candidate_path_2, '2.0.1')
174
172
            jobs = list(calculate_jobs(root))
175
 
        expected = self.make_jobs('2.0.1',  '2.0.0')
 
173
        expected = self.make_jobs('2.0.1', '2.0.0')
176
174
        self.assertItemsEqual(jobs, expected)
177
175
 
178
176
    def test_calculate_jobs_candiade_v1_and_v2(self):
188
186
            os.makedirs(candidate_path_2)
189
187
            make_build_var_file(candidate_path_2, '2.0.1')
190
188
            jobs = list(calculate_jobs(root))
191
 
        expected = self.make_jobs('2.0.1',  '2.0.0')
 
189
        expected = self.make_jobs('2.0.1', '2.0.0')
192
190
        expected.extend(self.make_jobs('1.24.3', '1.20.11'))
193
191
        self.assertItemsEqual(jobs, expected)
194
192