← Back to branch summary

~veebers/juju-ci-tools/model-migration-using-simple-resource-http

« back to all changes in this revision

Viewing changes to industrial_test.py

  • Committer: Aaron Bentley
  • Date: 2016-11-07 14:56:42 UTC
  • mfrom: (1699.2.11 indirect-config-7)
  • Revision ID: aaron.bentley@canonical.com-20161107145642-r31e3j50k4riberv
Accept client.env in make_substrate_manager and it callees.

Show diffs side-by-side

added added

removed removed

Lines of Context:
industrial_test.py
531
531
    If the substrate cannot be made, or does not have the required attributes,
532
532
    return None.  Otherwise, return the substrate.
533
533
    """
534
 
    with real_make_substrate_manager(
535
 
            client.env.config,
536
 
            client.env.get_cloud_credentials(),
537
 
            ) as substrate:
 
534
    with real_make_substrate_manager(client.env) as substrate:
538
535
        if substrate is not None:
539
536
            for attr in required_attrs:
540
537
                if getattr(substrate, attr, None) is None: