openstack/blazar
Code Issues Proposed changes

Upgrade hacking to the latest version

Browse Source 
Change-Id: I1c3b8e45d9e2618eb4ef9be23bb7746068354b32
This commit is contained in:
Sergey Lukjanov 2013-11-15 15:00:31 +04:00
parent b1e9a1c62b
commit 0041846fb8
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test-requirements.txt
View File

@ -1,4 +1,4 @@
hacking>=0.5.6,<0.8a0 hacking>=0.8.0,<0.9
docutils==0.9.1 docutils==0.9.1
nose nose

20
tests/db/sqlalchemy/test_sqlalchemy_api.py
View File

@ -105,8 +105,8 @@ class SQLAlchemyDBApiTestCase(test.DBTestCase):
""" """
result = db_api.lease_create(_get_fake_virt_lease_values()) result = db_api.lease_create(_get_fake_virt_lease_values())
self.assertEquals(result['name'], self.assertEqual(result['name'],
_get_fake_virt_lease_values()['name']) _get_fake_virt_lease_values()['name'])
self.assertEqual(0, len(db_api.event_get_all())) self.assertEqual(0, len(db_api.event_get_all()))
self.assertEqual(1, len(db_api.reservation_get_all())) self.assertEqual(1, len(db_api.reservation_get_all()))
@ -116,8 +116,8 @@ class SQLAlchemyDBApiTestCase(test.DBTestCase):
""" """
result = db_api.lease_create(_get_fake_phys_lease_values()) result = db_api.lease_create(_get_fake_phys_lease_values())
self.assertEquals(result['name'], self.assertEqual(result['name'],
_get_fake_phys_lease_values()['name']) _get_fake_phys_lease_values()['name'])
self.assertEqual(0, len(db_api.event_get_all())) self.assertEqual(0, len(db_api.event_get_all()))
self.assertEqual(1, len(db_api.reservation_get_all())) self.assertEqual(1, len(db_api.reservation_get_all()))
@ -135,8 +135,8 @@ class SQLAlchemyDBApiTestCase(test.DBTestCase):
lease = _get_fake_phys_lease_values() lease = _get_fake_phys_lease_values()
lease['events'].append(_get_fake_event_values(lease_id=lease['id'])) lease['events'].append(_get_fake_event_values(lease_id=lease['id']))
result = db_api.lease_create(lease) result = db_api.lease_create(lease)
self.assertEquals(result['name'], self.assertEqual(result['name'],
_get_fake_phys_lease_values()['name']) _get_fake_phys_lease_values()['name'])
self.assertEqual(1, len(db_api.event_get_all())) self.assertEqual(1, len(db_api.event_get_all()))
def test_delete_wrong_lease(self): def test_delete_wrong_lease(self):
@ -169,16 +169,16 @@ class SQLAlchemyDBApiTestCase(test.DBTestCase):
values=_get_fake_phys_lease_values(id='1', name='fake1')) values=_get_fake_phys_lease_values(id='1', name='fake1'))
_create_physical_lease( _create_physical_lease(
values=_get_fake_phys_lease_values(id='2', name='fake2')) values=_get_fake_phys_lease_values(id='2', name='fake2'))
self.assertEquals(['1', '2'], db_api.lease_list()) self.assertEqual(['1', '2'], db_api.lease_list())
def test_lease_update(self): def test_lease_update(self):
"""Update both start_time and name and check lease has been updated.""" """Update both start_time and name and check lease has been updated."""
result = _create_physical_lease() result = _create_physical_lease()
result = db_api.lease_update(result['id'], result = db_api.lease_update(result['id'],
values={'name': 'lease_renamed'}) values={'name': 'lease_renamed'})
self.assertEquals('lease_renamed', result['name']) self.assertEqual('lease_renamed', result['name'])
result = db_api.lease_update( result = db_api.lease_update(
result['id'], result['id'],
values={'start_date': _get_datetime('2014-02-01 00:00')}) values={'start_date': _get_datetime('2014-02-01 00:00')})
self.assertEquals(_get_datetime('2014-02-01 00:00'), self.assertEqual(_get_datetime('2014-02-01 00:00'),
result['start_date']) result['start_date'])