commit 7f12f983f35425eae328de78e4cb44a2f5185a67
author Jenkins <jenkins@review.openstack.org> Fri Dec 30 05:56:37 2016 +0000
committer Gerrit Code Review <review@openstack.org> Fri Dec 30 05:56:37 2016 +0000
tree 177aafe0c1f6588083e69cf8f1836aa2c2f2755f
parent 463d62a05f70632e7db48ce94e80db4fdab7b914
parent 37e51c50b9cf1dae2884a30413807f7978853323

Merge "Remove redundant assertIn('id', xxx)"

doc/source/conf.py

diff --git a/doc/source/conf.py b/doc/source/conf.py
index 2edaddb..04ddfdf 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-#
 # Tempest documentation build configuration file, created by
 # sphinx-quickstart on Tue May 21 17:43:32 2013.
 #

tempest/api/image/v1/test_images.py

diff --git a/tempest/api/image/v1/test_images.py b/tempest/api/image/v1/test_images.py
index 5b77ac3..0caaa67 100644
--- a/tempest/api/image/v1/test_images.py
+++ b/tempest/api/image/v1/test_images.py
@@ -36,7 +36,7 @@
         msg = ("The container format and the disk format don't match. "
                "Container format: %(container)s, Disk format: %(disk)s." %
                {'container': container_format, 'disk': disk_format})
-        raise exceptions.InvalidConfiguration(message=msg)
+        raise exceptions.InvalidConfiguration(msg)
 
     return container_format, disk_format
 

tempest/api/network/test_ports.py

diff --git a/tempest/api/network/test_ports.py b/tempest/api/network/test_ports.py
index 5b46088..e7153f0 100644
--- a/tempest/api/network/test_ports.py
+++ b/tempest/api/network/test_ports.py
@@ -108,7 +108,7 @@
         if ((address.version == 4 and address.prefixlen >= 30) or
            (address.version == 6 and address.prefixlen >= 126)):
             msg = ("Subnet %s isn't large enough for the test" % address.cidr)
-            raise exceptions.InvalidConfiguration(message=msg)
+            raise exceptions.InvalidConfiguration(msg)
         allocation_pools = {'allocation_pools': [{'start': str(address[2]),
                                                   'end': str(address[-2])}]}
         subnet = self.create_subnet(network, cidr=address,

tempest/api/volume/base.py

diff --git a/tempest/api/volume/base.py b/tempest/api/volume/base.py
index a2b9964..90dc7f4 100644
--- a/tempest/api/volume/base.py
+++ b/tempest/api/volume/base.py
@@ -51,7 +51,7 @@
                 raise cls.skipException(msg)
         else:
             msg = ("Invalid Cinder API version (%s)" % cls._api_version)
-            raise exceptions.InvalidConfiguration(message=msg)
+            raise exceptions.InvalidConfiguration(msg)
 
     @classmethod
     def setup_credentials(cls):