← Back to branch summary

~ubuntu-cloud-archive/ubuntu/precise/nova/trunk

« back to all changes in this revision

Viewing changes to nova/tests/api/openstack/volume/test_snapshots.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Adam Gandelman
  • Date: 2012-06-22 12:39:57 UTC
  • mfrom: (1.1.57)
  • Revision ID: package-import@ubuntu.com-20120622123957-hbzwg84nt9rqwg8r
Tags: 2012.2~f2~20120621.14517-0ubuntu1
[ Chuck Short ]
* New upstream version.

[ Adam Gandelman ]
* debian/rules: Temporarily disable test suite while blocking
  tests are investigated. 
* debian/patches/kombu_tests_timeout.patch: Dropped.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/api/openstack/volume/test_snapshots.py
20
20
from nova import exception
21
21
from nova import flags
22
22
from nova import log as logging
 
23
from nova.openstack.common import timeutils
23
24
from nova import test
24
25
from nova.tests.api.openstack import fakes
25
 
from nova import utils
26
26
from nova import volume
27
27
 
28
28
FLAGS = flags.FLAGS
170
170
            id='snap_id',
171
171
            status='snap_status',
172
172
            size=1024,
173
 
            created_at=utils.utcnow(),
 
173
            created_at=timeutils.utcnow(),
174
174
            display_name='snap_name',
175
175
            display_description='snap_desc',
176
176
            volume_id='vol_id',
188
188
                id='snap1_id',
189
189
                status='snap1_status',
190
190
                size=1024,
191
 
                created_at=utils.utcnow(),
 
191
                created_at=timeutils.utcnow(),
192
192
                display_name='snap1_name',
193
193
                display_description='snap1_desc',
194
194
                volume_id='vol1_id',
197
197
                id='snap2_id',
198
198
                status='snap2_status',
199
199
                size=1024,
200
 
                created_at=utils.utcnow(),
 
200
                created_at=timeutils.utcnow(),
201
201
                display_name='snap2_name',
202
202
                display_description='snap2_desc',
203
203
                volume_id='vol2_id',