← Back to branch summary

~andrewjbeach/juju-ci-tools/make-local-patcher

« back to all changes in this revision

Viewing changes to tests/test_schedule_hetero_control.py

Handle LoggedException in quickstart_deploy, assess_bootstrap.

Show diffs side-by-side

added added

removed removed

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