commit acb87401e0fe25e169016281bff96a8763cb2de2
author Jenkins <jenkins@review.openstack.org> Mon Feb 27 21:15:49 2012 +0000
committer Gerrit Code Review <review@openstack.org> Mon Feb 27 21:15:49 2012 +0000
tree 793fd6924e915a2d085f9d7a3a0addadb2eaae50
parent b90a1a6aa5b9b470fca3b4bedc442eb4cb193d20
parent 75923aee16521ae1449b355305e9384fdc69ceec

Merge "Removed expected failure from negative access IP tests"

tempest/tests/test_servers_negative.py

diff --git a/tempest/tests/test_servers_negative.py b/tempest/tests/test_servers_negative.py
index b841d38..70330d2 100644
--- a/tempest/tests/test_servers_negative.py
+++ b/tempest/tests/test_servers_negative.py
@@ -60,10 +60,9 @@
         else:
             self.fail('Cannot create a server with an invalid flavor')
 
-    @unittest.expectedFailure
+    @unittest.skipIf(release == 'diablo', 'Bug in Diablo, lp#891264')
     def test_invalid_access_ip_v4_address(self):
         """An access IPv4 address must match a valid address pattern"""
-        #Currently failing due to bug
         accessIPv4 = '1.1.1.1.1.1'
         name = rand_name('server')
         try:
@@ -76,10 +75,9 @@
         else:
             self.fail('Access IPv4 address must match the correct format')
 
-    @unittest.expectedFailure
+    @unittest.skipIf(release == 'diablo', 'Bug in Diablo, lp#891264')
     def test_invalid_ip_v6_address(self):
         """An access IPv6 address must match a valid address pattern"""
-        #Currently failing due to bug
         accessIPv6 = 'notvalid'
         name = rand_name('server')
         try: