← Back to branch summary

~sinzui/juju-ci-tools/login-u

« back to all changes in this revision

Viewing changes to tests/test_deploy_stack.py

  • Committer: Curtis Hovey
  • Date: 2017-02-28 20:34:53 UTC
  • mfrom: (1912.3.13 bootstrap-to-2)
  • Revision ID: curtis@canonical.com-20170228203453-x2wq6oqjx0a9qzt2
Honour the --to arg when BootstrapManager creates a client.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_deploy_stack.py
1088
1088
            series='trusty', debug=False, agent_url=None, agent_stream=None,
1089
1089
            keep_env=False, upload_tools=False, with_chaos=1, jes=False,
1090
1090
            region=None, verbose=False, upgrade=False, deadline=None,
1091
 
            controller_host=None, use_charmstore=False,
 
1091
            controller_host=None, use_charmstore=False, to=None
1092
1092
        )
1093
1093
        with self.ds_cxt():
1094
1094
            with patch('deploy_stack.background_chaos',
1112
1112
            series='trusty', debug=False, agent_url=None, agent_stream=None,
1113
1113
            keep_env=False, upload_tools=False, with_chaos=0, jes=False,
1114
1114
            region=None, verbose=False, upgrade=False, deadline=None,
1115
 
            controller_host=None, use_charmstore=False,
 
1115
            controller_host=None, use_charmstore=False, to=None
1116
1116
        )
1117
1117
        with self.ds_cxt():
1118
1118
            with patch('deploy_stack.background_chaos',
1131
1131
            series='trusty', debug=False, agent_url=None, agent_stream=None,
1132
1132
            keep_env=False, upload_tools=False, with_chaos=0, jes=False,
1133
1133
            region='region-foo', verbose=False, upgrade=False, deadline=None,
1134
 
            controller_host=None, use_charmstore=False,
1135
 
        )
 
1134
            controller_host=None, use_charmstore=False, to=None)
1136
1135
        with self.ds_cxt() as (client, bm_mock):
1137
1136
            with patch('deploy_stack.assess_juju_relations',
1138
1137
                       autospec=True):
1154
1153
            charm_prefix=None, bootstrap_host=None, machine=None, logs=None,
1155
1154
            debug=None, juju_bin=None, agent_url=None, agent_stream=None,
1156
1155
            keep_env=None, upload_tools=None, with_chaos=None, jes=None,
1157
 
            region=None, verbose=None, use_charmstore=False)
 
1156
            region=None, verbose=None, use_charmstore=False, to=None)
1158
1157
        with patch('deploy_stack.deploy_job_parse_args', return_value=args,
1159
1158
                   autospec=True):
1160
1159
            with patch('deploy_stack._deploy_job', autospec=True) as ds_mock:
1167
1166
            charm_prefix=None, bootstrap_host=None, machine=None, logs=None,
1168
1167
            debug=None, juju_bin=None, agent_url=None, agent_stream=None,
1169
1168
            keep_env=None, upload_tools=None, with_chaos=None, jes=None,
1170
 
            region=None, verbose=None, use_charmstore=False)
 
1169
            region=None, verbose=None, use_charmstore=False, to=None)
1171
1170
        with patch('deploy_stack.deploy_job_parse_args', return_value=args,
1172
1171
                   autospec=True):
1173
1172
            with patch('deploy_stack._deploy_job', autospec=True) as ds_mock:
1466
1465
            bootstrap_host='example.org', machine=['example.com'],
1467
1466
            series='angsty', agent_url='qux', agent_stream='escaped',
1468
1467
            region='eu-west-northwest-5', logs='pine', keep_env=True,
1469
 
            deadline=deadline)
 
1468
            deadline=deadline, to=None)
1470
1469
        with patch('deploy_stack.client_from_config') as fc_mock:
1471
1470
            bs_manager = BootstrapManager.from_args(args)
1472
1471
        fc_mock.assert_called_once_with('foo', 'bar', debug=True,
1495
1494
            bootstrap_host='example.org', machine=['example.com'],
1496
1495
            series='angsty', agent_url='qux', agent_stream='escaped',
1497
1496
            region='eu-west-northwest-5', logs='pine', keep_env=True,
1498
 
            deadline=deadline)
 
1497
            deadline=deadline, to=None)
1499
1498
        client = fake_juju_client()
1500
1499
        bs_manager = BootstrapManager.from_client(args, client)
1501
1500
        self.assertEqual('baz', bs_manager.temp_env_name)
1520
1519
            bootstrap_host='example.org', machine=['example.com'],
1521
1520
            series='angsty', agent_url='qux', agent_stream='escaped',
1522
1521
            region='eu-west-northwest-5', logs=None, keep_env=True,
1523
 
            deadline=None)
 
1522
            deadline=None, to=None)
1524
1523
        with patch('deploy_stack.client_from_config') as fc_mock:
1525
1524
            with patch('utility.os.makedirs'):
1526
1525
                bs_manager = BootstrapManager.from_args(args)
1561
1560
            bootstrap_host=None, machine=['example.com'],
1562
1561
            series='angsty', agent_url='qux', agent_stream='escaped',
1563
1562
            region='eu-west-northwest-5', logs='pine', keep_env=True,
1564
 
            deadline=None)
 
1563
            deadline=None, to=None)
1565
1564
        with patch('deploy_stack.client_from_config'):
1566
1565
            bs_manager = BootstrapManager.from_args(args)
1567
1566
        self.assertIs(None, bs_manager.bootstrap_host)
2621
2620
            with_chaos=0,
2622
2621
            jes=False,
2623
2622
            region=None,
 
2623
            to=None,
2624
2624
            deadline=None,
2625
2625
            controller_host=None,
2626
2626
            use_charmstore=False,