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

« back to all changes in this revision

Viewing changes to tests/test_perfscale_mass_model_destruction.py

  • Committer: Curtis Hovey
  • Date: 2017-01-25 02:32:29 UTC
  • mfrom: (1855 trunk)
  • mto: This revision was merged to the branch mainline in revision 1865.
  • Revision ID: curtis@canonical.com-20170125023229-g7c6bzt0cqe1j8g3
Merged trunk and resolved conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
6
6
import perfscale_mass_model_destruction as pmmd
7
7
from generate_perfscale_results import DeployDetails
8
8
from test_generate_perfscale_results import get_default_args
9
 
from fakejuju import fake_juju_client
 
9
from jujupy import fake_juju_client
10
10
from tests import (
11
11
    TestCase
12
12
)