Merge "Fix DB unit tests in the western hemisphere" into stable/liberty
This commit is contained in:
commit
7c0ddd0b97
|
@ -1862,7 +1862,7 @@ class DBAPIStackTest(common.HeatTestCase):
|
||||||
db_api.stack_count_all(self.ctx, tenant_safe=False))
|
db_api.stack_count_all(self.ctx, tenant_safe=False))
|
||||||
|
|
||||||
def test_purge_deleted(self):
|
def test_purge_deleted(self):
|
||||||
now = datetime.datetime.now()
|
now = datetime.datetime.utcnow()
|
||||||
delta = datetime.timedelta(seconds=3600 * 7)
|
delta = datetime.timedelta(seconds=3600 * 7)
|
||||||
deleted = [now - delta * i for i in range(1, 6)]
|
deleted = [now - delta * i for i in range(1, 6)]
|
||||||
templates = [create_raw_template(self.ctx) for i in range(5)]
|
templates = [create_raw_template(self.ctx) for i in range(5)]
|
||||||
|
@ -1887,7 +1887,7 @@ class DBAPIStackTest(common.HeatTestCase):
|
||||||
(), (0, 1, 2, 3, 4))
|
(), (0, 1, 2, 3, 4))
|
||||||
|
|
||||||
def test_purge_deleted_prev_raw_template(self):
|
def test_purge_deleted_prev_raw_template(self):
|
||||||
now = datetime.datetime.now()
|
now = datetime.datetime.utcnow()
|
||||||
templates = [create_raw_template(self.ctx) for i in range(2)]
|
templates = [create_raw_template(self.ctx) for i in range(2)]
|
||||||
stacks = [create_stack(self.ctx, templates[0],
|
stacks = [create_stack(self.ctx, templates[0],
|
||||||
create_user_creds(self.ctx),
|
create_user_creds(self.ctx),
|
||||||
|
|
Loading…
Reference in New Issue