commit 5cfafac5d8a5e0bb1f9657a02f2f7ea61b4f182d
author Jenkins <jenkins@review.openstack.org> Wed Jul 02 05:57:24 2014 +0000
committer Gerrit Code Review <review@openstack.org> Wed Jul 02 05:57:24 2014 +0000
tree 0fcfbf6b173a57aa5435cfbb78b500f60020867a
parent 8520a48a100c64b961e223aa43b7125fad034ada
parent 9a192d33cfbcce058d68b6a36fd10fa3dd38719b

Merge "Fix "create a flavor" tests for strong validation"

tempest/api/compute/v3/admin/test_flavors.py

diff --git a/tempest/api/compute/v3/admin/test_flavors.py b/tempest/api/compute/v3/admin/test_flavors.py
index 8a4e3cf..09d76b8 100644
--- a/tempest/api/compute/v3/admin/test_flavors.py
+++ b/tempest/api/compute/v3/admin/test_flavors.py
@@ -294,7 +294,7 @@
         flavor_name = data_utils.rand_name(self.flavor_name_prefix)
         new_flavor_id = data_utils.rand_int_id(start=1000)
 
-        ram = " 1024 "
+        ram = "1024"
         resp, flavor = self.client.create_flavor(flavor_name,
                                                  ram, self.vcpus,
                                                  self.disk,

tempest/api/compute/v3/admin/test_flavors_negative.py

diff --git a/tempest/api/compute/v3/admin/test_flavors_negative.py b/tempest/api/compute/v3/admin/test_flavors_negative.py
index 3f8a2da..6d3308e 100644
--- a/tempest/api/compute/v3/admin/test_flavors_negative.py
+++ b/tempest/api/compute/v3/admin/test_flavors_negative.py
@@ -57,7 +57,7 @@
         resp, flavor = self.client.create_flavor(flavor_name,
                                                  self.ram,
                                                  self.vcpus, self.disk,
-                                                 '',
+                                                 None,
                                                  ephemeral=self.ephemeral,
                                                  swap=self.swap,
                                                  rxtx=self.rxtx)