← Back to branch summary

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

« back to all changes in this revision

Viewing changes to tests/test_perfscale_longrunning.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:
tests/test_perfscale_longrunning.py
4
4
from mock import patch, Mock, call
5
5
import StringIO
6
6
 
7
 
from fakejuju import fake_juju_client
 
7
from jujupy import fake_juju_client
8
8
import perfscale_longrunning as pl
9
9
from tests import (
10
10
    parse_error,
123
123
        client = Mock()
124
124
        new_model = Mock()
125
125
        client.add_model.return_value = new_model
126
 
        client.env.clone.return_value = 'foo'
127
126
 
128
127
        with patch.object(pl, 'deploy_stack', autospec=True) as m_deploy_stack:
129
128
            pl.action_create(client, series='foo')
130
129
 
131
130
        m_deploy_stack.assert_called_once_with(new_model, 'foo')
132
 
        client.add_model.assert_called_once_with('foo')
 
131
        client.add_model.assert_called_once_with('newmodel')
133
132
 
134
133
 
135
134
class TestPerfscaleLongrunPerf(TestCase):