← Back to branch summary

~veebers/juju-ci-tools/perf-initial-heatmap-details

« back to all changes in this revision

Viewing changes to assess_heterogeneous_control.py

  • Committer: Aaron Bentley
  • Date: 2016-06-01 13:57:51 UTC
  • mfrom: (1445 trunk)
  • mto: This revision was merged to the branch mainline in revision 1447.
  • Revision ID: aaron.bentley@canonical.com-20160601135751-ra426srp52pl73rh
Merge trunk into application-not-service.

Show diffs side-by-side

added added

removed removed

Lines of Context:
assess_heterogeneous_control.py
44
44
    environment = SimpleEnvironment.from_config(base_env)
45
45
    if agent_url is None:
46
46
        environment.config.pop('tools-metadata-url', None)
 
47
    if initial == 'FAKE':
 
48
        from tests.test_jujupy import fake_juju_client
 
49
        client = fake_juju_client(env=environment)
 
50
        return client, client, client
47
51
    initial_client = EnvJujuClient.by_version(environment, initial,
48
52
                                              debug=debug)
49
53
    other_client = EnvJujuClient.by_version(initial_client.env, other,