commit 2f84a1e047d01280a324c17adb260ee1a83c1fbf
author Jenkins <jenkins@review.openstack.org> Tue Jun 04 07:49:57 2013 +0000
committer Gerrit Code Review <review@openstack.org> Tue Jun 04 07:49:57 2013 +0000
tree f7b232e78c55eb80ea4f97e85972794617f9333c
parent 3e773087fe0968b2d603ff346275acb794b92053
parent 2c2978703319631f1c0144db05f55dbad3a55c50

Merge "Update a test to work with Quantum SecGroup"

tempest/api/compute/servers/test_servers_negative.py

diff --git a/tempest/api/compute/servers/test_servers_negative.py b/tempest/api/compute/servers/test_servers_negative.py
index 5f53080..bbe489c 100644
--- a/tempest/api/compute/servers/test_servers_negative.py
+++ b/tempest/api/compute/servers/test_servers_negative.py
@@ -236,7 +236,11 @@
         # Create a server with a nonexistent security group
 
         security_groups = [{'name': 'does_not_exist'}]
-        self.assertRaises(exceptions.BadRequest,
+        if self.config.network.quantum_available:
+            expected_exception = exceptions.NotFound
+        else:
+            expected_exception = exceptions.BadRequest
+        self.assertRaises(expected_exception,
                           self.create_server,
                           security_groups=security_groups)