← Back to branch summary

~juju-qa/juju-ci-tools/trunk

« back to all changes in this revision

Viewing changes to deploy_stack.py

  • Committer: Nicholas Skaggs
  • Date: 2017-03-01 20:34:01 UTC
  • mto: This revision was merged to the branch mainline in revision 1918.
  • Revision ID: nicholas.skaggs@canonical.com-20170301203401-0t7rtz1exdq4nxjw
make _generate_default_clean_dir public

Show diffs side-by-side

added added

removed removed

Lines of Context:
deploy_stack.py
57
57
    make_substrate_manager,
58
58
)
59
59
from utility import (
60
 
    _generate_default_clean_dir,
 
60
    generate_default_clean_dir,
61
61
    add_basic_testing_arguments,
62
62
    configure_logging,
63
63
    ensure_deleted,
469
469
    configure_logging(args.verbose)
470
470
    series = args.series
471
471
    if not args.logs:
472
 
        args.logs = _generate_default_clean_dir(args.temp_env_name)
 
472
        args.logs = generate_default_clean_dir(args.temp_env_name)
473
473
    if series is None:
474
474
        series = 'precise'
475
475
    charm_series = series
705
705
    @classmethod
706
706
    def from_args(cls, args):
707
707
        if not args.logs:
708
 
            args.logs = _generate_default_clean_dir(args.temp_env_name)
 
708
            args.logs = generate_default_clean_dir(args.temp_env_name)
709
709
 
710
710
        # GZ 2016-08-11: Move this logic into client_from_config maybe?
711
711
        if args.juju_bin == 'FAKE':