Merge lp://staging/~abentley/juju-ci-tools/model-client-5 into lp://staging/juju-ci-tools

Proposed by Aaron Bentley
Status: Merged
Merged at revision: 1853
Proposed branch: lp://staging/~abentley/juju-ci-tools/model-client-5
Merge into: lp://staging/juju-ci-tools
Prerequisite: lp://staging/~abentley/juju-ci-tools/model-client-4
Diff against target: 541 lines (+71/-70)
7 files modified
industrial_test.py (+1/-1)
jujupy/__init__.py (+3/-1)
jujupy/client.py (+2/-2)
jujupy/tests/test_client.py (+61/-62)
jujupy/tests/test_version_client.py (+1/-1)
jujupy/version_client.py (+1/-1)
write_industrial_test_metadata.py (+2/-2)
To merge this branch: bzr merge lp://staging/~abentley/juju-ci-tools/model-client-5
Reviewer Review Type Date Requested Status
Juju Release Engineering Pending
Review via email: mp+315368@code.staging.launchpad.net

Commit message

Rename EnvJujuClient -> ModelClient.

Description of the change

This branch continues renaming EnvJujuClient to ModelClient.

See rationale here:
https://code.launchpad.net/~abentley/juju-ci-tools/model-client/+merge/315363

It completes the rename in test_client. It does the rename in client.py, but leaves a backwards-compatibility import in __init__.py.

It also updates:
 - write_industrial_test_metadata.py
 - jujupy/version_client.py
 - industrial_test.py
 - jujupy/tests/test_version_client.py

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches