~sinzui/juju-ci-tools/remove-jujuci-gets.

« back to all changes in this revision

Viewing changes to tests/test_assess_spaces_subnets.py

Committer: Curtis Hovey
Date: 2016-12-06 11:22:28 UTC
mfrom: (1468.2.323 trunk)
Revision ID: curtis@canonical.com-20161206112228-qqklcieubzbbolvr

Merge trunk

files added:
assess_add_cloud.py

assess_cloud.py

assess_cloud_display.py

assess_endpoint_bindings.py

assess_proxy.py

assess_public_clouds.py

aws.py

check_tar.py

gce.py

perfscale_longrunning.py

perfscale_mass_model_destruction.py

perfscale_xplod_charm.py

representative-tests.sh

s3check.py

tested-public-clouds

tested-public-clouds/fpc-2016-10-10.yaml

tested-public-clouds/fpc-2016-10-18.yaml

tests/test_assess_add_cloud.py

tests/test_assess_cloud.py

tests/test_assess_cloud_display.py

tests/test_assess_endpoint_bindings.py

tests/test_assess_proxy.py

tests/test_assess_public_clouds.py

tests/test_aws.py

tests/test_gce.py

tests/test_perfscale_longrunning.py

tests/test_perfscale_mass_model_destruction.py

tests/test_perfscale_xplod_charm.py

update-jenkins-slave.bash

update-windows-slave.bash

upgrade-maas-micro.bash

files removed:
inject-metadata

update-jenkins-branches.bash

files modified:
Makefile

assess_autoload_credentials.py

assess_block.py

assess_bootstrap.py

assess_constraints.py

assess_container_networking.py

assess_heterogeneous_control.py

assess_log_forward.py

assess_log_rotation.py

assess_mixed_images.py

assess_model_config_tree.py

assess_model_migration.py

assess_recovery.py

assess_ssh_keys.py

assess_storage.py

assess_win_client.py

bootstrap

build_juju.py

clean_resources.py

cloud_deploy.py

convert_config.py

deploy_stack.py

example-collectd.conf

fakejuju.py

generate_perfscale_results.py

industrial_test.py

juju-ci-tools-common

jujuconfig.py

jujupy.py

mac-win-requirements.txt

perf_graphing.py

perfscale_deployment.py

requirements.txt

run-uitests.bash

substrate.py

template_assess.py.tmpl

template_test.py.tmpl

tests/__init__.py

tests/test_assess_autoload_credentials.py

tests/test_assess_block.py

tests/test_assess_bootstrap.py

tests/test_assess_constraints.py

tests/test_assess_container_networking.py

tests/test_assess_heterogeneous_control.py

tests/test_assess_jes_deploy.py

tests/test_assess_log_rotation.py

tests/test_assess_mixed_images.py

tests/test_assess_model_config_tree.py

tests/test_assess_model_migration.py

tests/test_assess_recovery.py

tests/test_assess_spaces_subnets.py

tests/test_assess_ssh_keys.py

tests/test_assess_storage.py

tests/test_assess_unregister.py

tests/test_build_juju.py

tests/test_chaos.py

tests/test_clean_resources.py

tests/test_deploy_stack.py

tests/test_generate_perfscale_results.py

tests/test_industrial_test.py

tests/test_jujuconfig.py

tests/test_jujupy.py

tests/test_perfscale_deployment.py

tests/test_quickstart_deploy.py

tests/test_run_deployer.py

tests/test_substrate.py

tests/test_utility.py

tests/test_verify_landscape_bundle.py

utility.py

write_industrial_test_metadata.py

Show diffs side-by-side

added added

removed removed

tests/test_assess_spaces_subnets.py

222

patch.object(self.client, 'juju', self.juju_mock.juju),

223

patch.object(self.client, 'get_status', self.juju_mock.get_status),

224

patch.object(self.client, 'juju_async', self.juju_mock.juju_async),

225

patch.object(self.client, 'wait_for', nil_func),

226

225

patch.object(self.client, 'wait_for_started',

227

226

self.juju_mock.get_status),

228

227

patch.object(self.client, 'get_juju_output', self.juju_mock.juju),

Older »