← Back to branch summary

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

« back to all changes in this revision

Viewing changes to assess_jes_deploy.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:
assess_jes_deploy.py
55
55
    if series is None:
56
56
        series = 'precise'
57
57
    charm_series = series
58
 
    client = client_from_config(base_env, args.juju_bin, args.debug)
 
58
    client = client_from_config(base_env, args.juju_bin, args.debug,
 
59
                                soft_deadline=args.deadline)
59
60
    if not client.is_jes_enabled():
60
61
        client.enable_jes()
61
62
    with boot_context(
105
106
 
106
107
def main():
107
108
    parser = ArgumentParser()
108
 
    add_basic_testing_arguments(parser, using_jes=True)
 
109
    add_basic_testing_arguments(parser, using_jes=True, deadline=True)
109
110
    args = parser.parse_args()
110
111
    with jes_setup(args) as (client, charm_series, base_env):
111
112
        test_jes_deploy(client, charm_series, args.logs, base_env)