← Back to branch summary

~ubuntu-branches/ubuntu/vivid/ironic/vivid-updates

« back to all changes in this revision

Viewing changes to ironic/tests/objects/test_chassis.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2015-03-30 11:14:57 UTC
  • mfrom: (1.2.6)
  • Revision ID: package-import@ubuntu.com-20150330111457-kr4ju3guf22m4vbz
Tags: 2015.1~b3-0ubuntu1
https://launchpad.net/bugs/1358820
https://launchpad.net/bugs/1429962
* New upstream release.
  + d/control: 
    - Align with upstream dependencies.
    - Add dh-python to build-dependencies.
    - Add psmisc as a dependency. (LP: #1358820)
  + d/p/fix-requirements.patch: Rediffed.
  + d/ironic-conductor.init.in: Fixed typos in LSB headers,
    thanks to JJ Asghar. (LP: #1429962)

Show diffs side-by-side

added added

removed removed

Lines of Context:
ironic/tests/objects/test_chassis.py
14
14
#    under the License.
15
15
 
16
16
import mock
 
17
from oslo_utils import uuidutils
17
18
from testtools.matchers import HasLength
18
19
 
19
20
from ironic.common import exception
20
 
from ironic.common import utils as ironic_utils
21
21
from ironic import objects
22
22
from ironic.tests.db import base
23
23
from ironic.tests.db import utils
74
74
 
75
75
    def test_refresh(self):
76
76
        uuid = self.fake_chassis['uuid']
77
 
        new_uuid = ironic_utils.generate_uuid()
 
77
        new_uuid = uuidutils.generate_uuid()
78
78
        returns = [dict(self.fake_chassis, uuid=uuid),
79
79
                   dict(self.fake_chassis, uuid=new_uuid)]
80
80
        expected = [mock.call(uuid), mock.call(uuid)]