commit 9a6e697619925dd666342db1d0ce7619a946ba28
author Jenkins <jenkins@review.openstack.org> Fri Mar 28 13:31:51 2014 +0000
committer Gerrit Code Review <review@openstack.org> Fri Mar 28 13:31:51 2014 +0000
tree 1ac8f1e9a839d3cc984896da9d000deff39ad1be
parent 0c09350d7ce2b9751f5562b3a313be2d2b30817b
parent c55690d092816e46fc92e49d9d08f814c4534d0f

Merge "Enable private flavors tests"

tempest/api/compute/admin/test_flavors.py

diff --git a/tempest/api/compute/admin/test_flavors.py b/tempest/api/compute/admin/test_flavors.py
index 759585e..111ac9c 100644
--- a/tempest/api/compute/admin/test_flavors.py
+++ b/tempest/api/compute/admin/test_flavors.py
@@ -170,7 +170,6 @@
                 flag = True
         self.assertTrue(flag)
 
-    @test.skip_because(bug='1286297')
     @test.attr(type='gate')
     def test_list_non_public_flavor(self):
         # Create a flavor with os-flavor-access:is_public false.

tempest/api/compute/admin/test_flavors_access.py

diff --git a/tempest/api/compute/admin/test_flavors_access.py b/tempest/api/compute/admin/test_flavors_access.py
index aa0138f..193d415 100644
--- a/tempest/api/compute/admin/test_flavors_access.py
+++ b/tempest/api/compute/admin/test_flavors_access.py
@@ -46,7 +46,6 @@
         cls.vcpus = 1
         cls.disk = 10
 
-    @test.skip_because(bug='1286297')
     @test.attr(type='gate')
     def test_flavor_access_list_with_private_flavor(self):
         # Test to make sure that list flavor access on a newly created