← Back to branch summary

~nskaggs/juju-ci-tools/add-grant-to-rep-tests

« back to all changes in this revision

Viewing changes to tests/test_industrial_test.py

  • Committer: Aaron Bentley
  • Date: 2016-11-28 17:37:43 UTC
  • mfrom: (1762.2.13 named-cloud)
  • Revision ID: aaron.bentley@canonical.com-20161128173743-qw02f5etm835rles
Store cloud name in JujuData.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_industrial_test.py
94
94
 
95
95
def get_aws_juju_data():
96
96
    aws_env = get_aws_env()
97
 
    return JujuData(aws_env.environment, aws_env.config)
 
97
    return JujuData(aws_env.environment, aws_env.make_config_copy())
98
98
 
99
99
 
100
100
class JujuPyTestCase(FakeHomeTestCase):
1341
1341
        client.env.clouds = {'clouds': {'quxxx': {
1342
1342
            'type': 'openstack', 'endpoint': 'qux',
1343
1343
            }}}
1344
 
        client.env.config = get_os_config()
 
1344
        client.env._config = get_os_config()
1345
1345
        client.env.credentials = {'credentials': {'quxxx': {'creds': {
1346
1346
            }}}}
1347
1347
        return client
1533
1533
        machine_started = {'juju-status': {'current': 'idle'}}
1534
1534
        unit_started = {'agent-status': {'current': 'idle'}}
1535
1535
        client = FakeEnvJujuClient()
1536
 
        client.env.config['default-series'] = 'angsty'
 
1536
        client.env.update_config({'default-series': 'angsty'})
1537
1537
        self.do_iter_steps(client, LXD_MACHINE, machine_started, unit_started)
1538
1538
 
1539
1539
    def test_iter_steps_1x(self):
1541
1541
        client = FakeEnvJujuClient()
1542
1542
        with patch.object(EnvJujuClient, 'supported_container_types',
1543
1543
                          frozenset([KVM_MACHINE, LXC_MACHINE])):
1544
 
            client.env.config['default-series'] = 'angsty'
 
1544
            client.env.update_config({'default-series': 'angsty'})
1545
1545
            self.do_iter_steps(client, LXC_MACHINE, started_state,
1546
1546
                               started_state)
1547
1547
 
1651
1651
    def test_iter_step_failure(self):
1652
1652
        deploy_many = DeployManyAttempt()
1653
1653
        client = FakeEnvJujuClient()
1654
 
        client.env.config['default-series'] = 'angsty'
 
1654
        client.env.update_config({'default-series': 'angsty'})
1655
1655
        deploy_iter = iter_steps_validate_info(self, deploy_many, client)
1656
1656
        self.assertEqual(deploy_iter.next(), {'test_id': 'add-machine-many'})
1657
1657
        status = {
1703
1703
    def test_iter_step_add_machine_failure(self):
1704
1704
        deploy_many = DeployManyAttempt()
1705
1705
        client = FakeEnvJujuClient()
1706
 
        client.env.config['default-series'] = 'angsty'
 
1706
        client.env.update_config({'default-series': 'angsty'})
1707
1707
        deploy_iter = iter_steps_validate_info(self, deploy_many, client)
1708
1708
        self.assertEqual(deploy_iter.next(), {'test_id': 'add-machine-many'})
1709
1709
        status = {
1776
1776
    def test_wait_until_removed_timeout_azure(self):
1777
1777
        deploy_many = DeployManyAttempt(host_count=4, container_count=0)
1778
1778
        client = fake_juju_client()
1779
 
        client.env.config['type'] = 'azure'
1780
 
        client.env.config['location'] = 'us-west-1'
 
1779
        client.env._config['type'] = 'azure'
 
1780
        client.env.set_region('us-west-1')
1781
1781
        client.bootstrap()
1782
1782
        deploy_iter = iter_steps_validate_info(self, deploy_many, client)
1783
1783
        with patch('industrial_test.wait_until_removed') as wur_mock:
1788
1788
    def test_wait_until_removed_timeout_not_azure(self):
1789
1789
        deploy_many = DeployManyAttempt(host_count=4, container_count=0)
1790
1790
        client = fake_juju_client()
1791
 
        client.env.config['type'] = 'aws'
 
1791
        client.env._config['type'] = 'aws'
1792
1792
        client.bootstrap()
1793
1793
        deploy_iter = iter_steps_validate_info(self, deploy_many, client)
1794
1794
        with patch('industrial_test.wait_until_removed') as wur_mock:
1809
1809
        client = FakeEnvJujuClient()
1810
1810
        aws_env = get_aws_env()
1811
1811
        client.env.environment = aws_env.environment
1812
 
        client.env.config = aws_env.config
 
1812
        client.env._config = aws_env._config
1813
1813
        client.env.juju_home = aws_env.juju_home
1814
1814
        client.env.credentials = {'credentials': {'aws': {'creds': {}}}}
1815
1815
        controller_client = client.get_controller_client()
1816
1816
        environ = dict(os.environ)
1817
 
        environ.update(get_euca_env(client.env.config))
 
1817
        environ.update(get_euca_env(client.env._config))
1818
1818
 
1819
1819
        def check_output(*args, **kwargs):
1820
1820
            if args == ((
1881
1881
        azure_env = SimpleEnvironment('steve', get_azure_config())
1882
1882
        client = FakeEnvJujuClient()
1883
1883
        client.env.environment = azure_env.environment
1884
 
        client.env.config = azure_env.config
 
1884
        client.env._config = azure_env._config
1885
1885
        client.env.credentials = {'credentials': {'azure': {'creds': {}}}}
1886
1886
        controller_client = client.get_controller_client()
1887
1887
        # First yield.