commit 10478954165dd091452af61fc86b65d6e6253125
author Jenkins <jenkins@review.openstack.org> Wed Feb 04 13:03:55 2015 +0000
committer Gerrit Code Review <review@openstack.org> Wed Feb 04 13:03:55 2015 +0000
tree 1ef2865e9a724c2d087619c5afc73f830ead9b1e
parent 2f5f9835aff3a503cdbc4590feb82a535ec7d348
parent a4cae616b117e864b36c5eec1969e663999f32d9

Merge "Do not parse Neutron error message to tolerate message changing"

tempest/api/network/test_dhcp_ipv6.py

diff --git a/tempest/api/network/test_dhcp_ipv6.py b/tempest/api/network/test_dhcp_ipv6.py
index 6ce1216..1257699 100644
--- a/tempest/api/network/test_dhcp_ipv6.py
+++ b/tempest/api/network/test_dhcp_ipv6.py
@@ -327,12 +327,11 @@
                                    subnet["allocation_pools"][0]["end"])
         ip = netaddr.IPAddress(random.randrange(
             ip_range.last + 1, ip_range.last + 10)).format()
-        self.assertRaisesRegexp(exceptions.BadRequest,
-                                "not a valid IP for the defined subnet",
-                                self.create_port,
-                                self.network,
-                                fixed_ips=[{'subnet_id': subnet['id'],
-                                            'ip_address': ip}])
+        self.assertRaises(exceptions.BadRequest,
+                          self.create_port,
+                          self.network,
+                          fixed_ips=[{'subnet_id': subnet['id'],
+                                      'ip_address': ip}])
 
     def test_dhcp_stateful_fixedips_duplicate(self):
         """When port gets IP address from fixed IP range it