← 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_objects.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_objects.py
18
18
 
19
19
import iso8601
20
20
import netaddr
21
 
from oslo.utils import timeutils
 
21
from oslo_context import context
 
22
from oslo_utils import timeutils
22
23
import six
23
24
 
24
25
from ironic.common import exception
25
26
from ironic.objects import base
26
27
from ironic.objects import utils
27
 
from ironic.openstack.common import context
28
28
from ironic.tests import base as test_base
29
29
 
30
30
gettext.install('ironic')
427
427
                    'ironic_object.data':
428
428
                        {'created_at': timeutils.isotime(dt),
429
429
                         'updated_at': timeutils.isotime(dt),
430
 
                        }
 
430
                         }
431
431
                    }
432
432
        actual = obj.obj_to_primitive()
433
433
        # ironic_object.changes is built from a set and order is undefined