← Back to branch summary

~jimbaker/pyjuju/debug-relation-hook-context

« back to all changes in this revision

Viewing changes to juju/providers/ec2/tests/test_launch.py

https://launchpad.net/bugs/781949
[r=hazmat][f=781949] Make it so EC2 provider can check SSL cert validity

Show diffs side-by-side

added added

removed removed

Lines of Context:
juju/providers/ec2/tests/test_launch.py
270
270
        self._mock_create_machine_group("1")
271
271
        self._mock_launch_utils(
272
272
            ami_name="ami-regional",
273
 
            get_ami_args=("splendid", "amd64", "somewhere-else-1", False))
 
273
            get_ami_args=(
 
274
                "splendid", "amd64", "somewhere-else-1", False, False))
274
275
        self._mock_get_zookeeper_hosts()
275
276
        self._mock_launch(self.get_instance("i-foobar"), "ami-regional")
276
277
        self.mocker.replay()
287
288
        self._mock_create_machine_group("1")
288
289
        self._mock_launch_utils(
289
290
            ami_name="ami-fancy-cluster",
290
 
            get_ami_args=("vast", "amd64", "us-east-1", True))
 
291
            get_ami_args=("vast", "amd64", "us-east-1", True, False))
291
292
        self._mock_get_zookeeper_hosts()
292
293
        self._mock_launch(
293
294
            self.get_instance("i-foobar"), "ami-fancy-cluster",
306
307
        self._mock_create_group()
307
308
        self._mock_create_machine_group("1")
308
309
        self._mock_launch_utils(
309
 
            get_ami_args=("dribbly", "amd64", "us-east-1", False))
 
310
            get_ami_args=("dribbly", "amd64", "us-east-1", False, False))
310
311
        self._mock_get_zookeeper_hosts()
311
312
        self._mock_launch(
312
313
            self.get_instance("i-foobar"), "ami-default",