commit 46b0e04e403779f813a32094c55e3612a06243be
author Jenkins <jenkins@review.openstack.org> Wed Jun 26 13:13:03 2013 +0000
committer Gerrit Code Review <review@openstack.org> Wed Jun 26 13:13:03 2013 +0000
tree fc5ac55d6f9adf55b7dbcdac3f3fa1425822ab5e
parent 54034f18bfbb2a1c4850ea4f9e38700286aa5520
parent ce89f63a6b8ce5915ab52a1aee40b51b282cd7d5

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