← Back to branch summary

~sseman/juju-ci-tools/assess-min-version

« back to all changes in this revision

Viewing changes to industrial_test.py

  • Committer: Aaron Bentley
  • Date: 2016-03-18 14:47:06 UTC
  • mto: This revision was merged to the branch mainline in revision 1324.
  • Revision ID: aaron.bentley@canonical.com-20160318144706-z7wy9c21m3psi6g5
Introduce set_model_name, update tests, check controller on bootstrap.

Show diffs side-by-side

added added

removed removed

Lines of Context:
industrial_test.py
198
198
        :param debug: If True, use juju --debug logging.
199
199
        """
200
200
        old_env = SimpleEnvironment.from_config(env)
201
 
        old_env.environment = env + '-old'
 
201
        old_env.set_model_name(env + '-old')
202
202
        old_client = EnvJujuClient.by_version(old_env, debug=debug)
203
203
        new_env = SimpleEnvironment.from_config(env)
204
 
        new_env.environment = env + '-new'
 
204
        new_env.set_model_name(env + '-new')
205
205
        if new_agent_url is not None:
206
206
            new_env.config['tools-metadata-url'] = new_agent_url
207
207
        uniquify_local(new_env)
975
975
 
976
976
def run_single(args):
977
977
    env = SimpleEnvironment.from_config(args.env)
978
 
    env.environment = env.environment + '-single'
 
978
    env.set_model_name(env.environment + '-single')
979
979
    upgrade_client = EnvJujuClient.by_version(
980
980
        env, debug=args.debug)
981
981
    client = EnvJujuClient.by_version(