From aff466e02026b0345a13651efcb5124c3ada6fe9 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Mon, 19 Nov 2012 07:54:55 -0500 Subject: [PATCH] use deleted=False instead of deleted=0 in queries Mysql treats 0 and False as the same thing, but this isn't true for postgresql which is much more strongly typed. Our whitebox testing was failing on postgresql because of this assumption. Change-Id: I1a7339814b1de6e0c5874ba5b56fc90db6fbb012 --- tempest/tests/compute/images/test_images_whitebox.py | 4 ++-- tempest/tests/compute/servers/test_servers_whitebox.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tempest/tests/compute/images/test_images_whitebox.py b/tempest/tests/compute/images/test_images_whitebox.py index f371fe4e1e..40433a7c55 100644 --- a/tempest/tests/compute/images/test_images_whitebox.py +++ b/tempest/tests/compute/images/test_images_whitebox.py @@ -50,7 +50,7 @@ class ImagesWhiteboxTest(whitebox.ComputeWhiteboxTest, base.BaseComputeTest): cls.image_ids.remove(image_id) @classmethod - def update_state(self, server_id, vm_state, task_state, deleted=0): + def update_state(self, server_id, vm_state, task_state, deleted=False): """Update states of an instance in database for validation""" if not task_state: task_state = "NULL" @@ -63,7 +63,7 @@ class ImagesWhiteboxTest(whitebox.ComputeWhiteboxTest, base.BaseComputeTest): self.connection.execute(stmt, autocommit=True) - def _test_create_image_409_base(self, vm_state, task_state, deleted=0): + def _test_create_image_409_base(self, vm_state, task_state, deleted=False): """Base method for create image tests based on vm and task states""" try: self.update_state(self.shared_server['id'], vm_state, diff --git a/tempest/tests/compute/servers/test_servers_whitebox.py b/tempest/tests/compute/servers/test_servers_whitebox.py index 152b3f7c84..980f6cf8aa 100644 --- a/tempest/tests/compute/servers/test_servers_whitebox.py +++ b/tempest/tests/compute/servers/test_servers_whitebox.py @@ -63,7 +63,7 @@ class ServersWhiteboxTest(whitebox.ComputeWhiteboxTest): # Set vcpu quota for tenant if not already set if not result: cores_hard_limit = 2 - stmt = quotas.insert().values(deleted=0, + stmt = quotas.insert().values(deleted=False, project_id=self.tenant_id, resource='cores', hard_limit=cores_hard_limit) @@ -95,7 +95,7 @@ class ServersWhiteboxTest(whitebox.ComputeWhiteboxTest): # Set memory quota for tenant if not already set if not result: ram_hard_limit = 1024 - stmt = quotas.insert().values(deleted=0, + stmt = quotas.insert().values(deleted=False, project_id=self.tenant_id, resource='ram', hard_limit=ram_hard_limit) @@ -116,7 +116,7 @@ class ServersWhiteboxTest(whitebox.ComputeWhiteboxTest): stmt = quotas.delete() self.connection.execute(stmt, autocommit=True) - def update_state(self, server_id, vm_state, task_state, deleted=0): + def update_state(self, server_id, vm_state, task_state, deleted=False): """Update states of an instance in database for validation""" if not task_state: task_state = 'NULL'