← Back to branch summary

~andrewjbeach/juju-ci-tools/get-juju-dict

« back to all changes in this revision

Viewing changes to scale_out.py

  • Committer: Aaron Bentley
  • Date: 2016-09-20 18:03:54 UTC
  • mfrom: (1575.2.14 soft-timeouts-6)
  • Revision ID: aaron.bentley@canonical.com-20160920180354-7c7o5evlpoabrz9y
Add --timeout to most test scripts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
scale_out.py
34
34
    series = args.series
35
35
    if series is None:
36
36
        series = 'trusty'
37
 
    client = client_from_config(args.env, args.juju_bin, args.debug)
 
37
    client = client_from_config(args.env, args.juju_bin, args.debug,
 
38
                                soft_deadline=args.deadline)
38
39
    with boot_context(
39
40
            args.temp_env_name,
40
41
            client,