Enable H407,H305,H307,E122 ignore E123

After bumping the hacking version to the 0.9.x series ignores were
added for several rules. This commit fixes the violations for a subset
of these rules and re-enables the checks.

E123 is ignored because this rule is ignored in the default pep8 by
default, due to a lack of consensus around it.

Change-Id: I8f14cd2ca6afc38d3fe8ee758272071111022896
This commit is contained in:
Matthew Treinish 2014-06-09 18:37:19 -04:00
parent fceab11864
commit 96e9e88dc0
51 changed files with 80 additions and 47 deletions

View File

@ -15,9 +15,9 @@
import base64 import base64
import logging import logging
import urlparse
import testtools import testtools
import urlparse
from tempest.api.compute import base from tempest.api.compute import base
from tempest.common.utils import data_utils from tempest.common.utils import data_utils

View File

@ -14,9 +14,9 @@
# under the License. # under the License.
import logging import logging
import urlparse
import testtools import testtools
import urlparse
from tempest.api.compute import base from tempest.api.compute import base
from tempest.common.utils import data_utils from tempest.common.utils import data_utils

View File

@ -13,11 +13,13 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from testtools import matchers
from tempest.api.compute import base from tempest.api.compute import base
from tempest.common.utils import data_utils from tempest.common.utils import data_utils
from tempest import config from tempest import config
from tempest import test from tempest import test
from testtools import matchers
CONF = config.CONF CONF = config.CONF

View File

@ -12,6 +12,7 @@
import datetime import datetime
import re import re
from tempest.api.identity import base from tempest.api.identity import base
from tempest import auth from tempest import auth
from tempest import clients from tempest import clients

View File

@ -17,10 +17,11 @@ import cStringIO as StringIO
import hashlib import hashlib
import random import random
import re import re
import six
import time import time
import zlib import zlib
import six
from tempest.api.object_storage import base from tempest.api.object_storage import base
from tempest.common import custom_matchers from tempest.common import custom_matchers
from tempest.common.utils import data_utils from tempest.common.utils import data_utils

View File

@ -11,6 +11,7 @@
# under the License. # under the License.
import os.path import os.path
import yaml import yaml
from tempest import clients from tempest import clients

View File

@ -12,6 +12,7 @@
import logging import logging
import netaddr import netaddr
from tempest.api.orchestration import base from tempest.api.orchestration import base

View File

@ -14,6 +14,7 @@
# limitations under the License. # limitations under the License.
import logging import logging
from six import moves from six import moves
from testtools import matchers from testtools import matchers

View File

@ -15,11 +15,12 @@
# under the License. # under the License.
import operator import operator
from testtools import matchers
from tempest.api.volume import base from tempest.api.volume import base
from tempest.common.utils import data_utils from tempest.common.utils import data_utils
from tempest.openstack.common import log as logging from tempest.openstack.common import log as logging
from tempest import test from tempest import test
from testtools import matchers
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

View File

@ -13,8 +13,10 @@
# under the License. # under the License.
import copy import copy
from tempest.api_schema.response.compute import hypervisors from tempest.api_schema.response.compute import hypervisors
hypervisors_servers = copy.deepcopy(hypervisors.common_hypervisors_detail) hypervisors_servers = copy.deepcopy(hypervisors.common_hypervisors_detail)
# Defining extra attributes for V3 show hypervisor schema # Defining extra attributes for V3 show hypervisor schema

View File

@ -13,8 +13,10 @@
# under the License. # under the License.
import copy import copy
from tempest.api_schema.response.compute import hypervisors from tempest.api_schema.response.compute import hypervisors
list_hypervisors_detail = copy.deepcopy( list_hypervisors_detail = copy.deepcopy(
hypervisors.common_list_hypervisors_detail) hypervisors.common_list_hypervisors_detail)
# Defining extra attributes for V3 show hypervisor schema # Defining extra attributes for V3 show hypervisor schema

View File

@ -55,9 +55,7 @@ addresses_v3['patternProperties']['^[a-zA-Z0-9-_.]+$']['items'][
'mac_addr': {'type': 'string'} 'mac_addr': {'type': 'string'}
}) })
addresses_v3['patternProperties']['^[a-zA-Z0-9-_.]+$']['items'][ addresses_v3['patternProperties']['^[a-zA-Z0-9-_.]+$']['items'][
'required'].extend( 'required'].extend(['type', 'mac_addr'])
['type', 'mac_addr']
)
update_server = copy.deepcopy(servers.base_update_get_server) update_server = copy.deepcopy(servers.base_update_get_server)
update_server['response_body']['properties']['server']['properties'].update({ update_server['response_body']['properties']['server']['properties'].update({

View File

@ -18,16 +18,17 @@ import copy
import datetime import datetime
import exceptions import exceptions
import re import re
import six
import urlparse import urlparse
import six
from tempest import config from tempest import config
from tempest.openstack.common import log as logging
from tempest.services.identity.json import identity_client as json_id from tempest.services.identity.json import identity_client as json_id
from tempest.services.identity.v3.json import identity_client as json_v3id from tempest.services.identity.v3.json import identity_client as json_v3id
from tempest.services.identity.v3.xml import identity_client as xml_v3id from tempest.services.identity.v3.xml import identity_client as xml_v3id
from tempest.services.identity.xml import identity_client as xml_id from tempest.services.identity.xml import identity_client as xml_id
from tempest.openstack.common import log as logging
CONF = config.CONF CONF = config.CONF
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

View File

@ -15,6 +15,7 @@
import logging import logging
import re import re
import testtools import testtools
from tempest import cli from tempest import cli

View File

@ -12,6 +12,7 @@
import json import json
import os import os
import yaml import yaml
import tempest.cli import tempest.cli

View File

@ -19,13 +19,13 @@ resources in a declarative way.
""" """
import argparse
import logging import logging
import os import os
import sys import sys
import unittest import unittest
import yaml
import argparse import yaml
import tempest.auth import tempest.auth
from tempest import config from tempest import config

View File

@ -18,13 +18,14 @@ import argparse
import inspect import inspect
import json import json
import sys import sys
from testtools import testsuite
try: try:
from unittest import loader from unittest import loader
except ImportError: except ImportError:
# unittest in python 2.6 does not contain loader, so uses unittest2 # unittest in python 2.6 does not contain loader, so uses unittest2
from unittest2 import loader from unittest2 import loader
from testtools import testsuite
from tempest.openstack.common import log as logging from tempest.openstack.common import log as logging
from tempest.stress import driver from tempest.stress import driver

View File

@ -14,6 +14,7 @@
import hashlib import hashlib
import os import os
import yaml import yaml
from tempest import auth from tempest import auth

View File

@ -12,6 +12,7 @@
# limitations under the License. # limitations under the License.
import abc import abc
import six import six
from tempest import config from tempest import config

View File

@ -14,7 +14,6 @@
from tempest.common import commands from tempest.common import commands
from tempest import config from tempest import config
from tempest.openstack.common import log as logging from tempest.openstack.common import log as logging
CONF = config.CONF CONF = config.CONF

View File

@ -19,15 +19,17 @@ import copy
import hashlib import hashlib
import httplib import httplib
import json import json
import OpenSSL
import posixpath import posixpath
import re import re
from six import moves
import socket import socket
import StringIO import StringIO
import struct import struct
import urlparse import urlparse
import OpenSSL
from six import moves
from tempest import exceptions as exc from tempest import exceptions as exc
from tempest.openstack.common import log as logging from tempest.openstack.common import log as logging

View File

@ -16,12 +16,12 @@
import collections import collections
import json import json
from lxml import etree
import re import re
import string import string
import time import time
import jsonschema import jsonschema
from lxml import etree
from tempest.common import http from tempest.common import http
from tempest.common.utils import misc as misc_utils from tempest.common.utils import misc as misc_utils

View File

@ -16,11 +16,12 @@
import cStringIO import cStringIO
import select import select
import six
import socket import socket
import time import time
import warnings import warnings
import six
from tempest import exceptions from tempest import exceptions
from tempest.openstack.common import log as logging from tempest.openstack.common import log as logging

View File

@ -11,9 +11,10 @@
# under the License. # under the License.
import re import re
import six
import time import time
import six
from tempest.common import ssh from tempest.common import ssh
from tempest import config from tempest import config
from tempest import exceptions from tempest import exceptions

View File

@ -17,7 +17,6 @@
import logging import logging
import os import os
import re import re
import six
import subprocess import subprocess
import time import time
@ -27,6 +26,7 @@ from heatclient import exc as heat_exceptions
import netaddr import netaddr
from neutronclient.common import exceptions as exc from neutronclient.common import exceptions as exc
from novaclient import exceptions as nova_exceptions from novaclient import exceptions as nova_exceptions
import six
from tempest.api.network import common as net_common from tempest.api.network import common as net_common
from tempest import auth from tempest import auth

View File

@ -10,9 +10,10 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import heatclient.exc as heat_exceptions
import time import time
import heatclient.exc as heat_exceptions
from tempest import config from tempest import config
from tempest.scenario import manager from tempest.scenario import manager
from tempest import test from tempest import test

View File

@ -15,6 +15,7 @@
# under the License. # under the License.
import collections import collections
import re import re
import testtools import testtools
from tempest.api.network import common as net_common from tempest.api.network import common as net_common

View File

@ -13,9 +13,10 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from lxml import etree
import urllib import urllib
from lxml import etree
from tempest.common import rest_client from tempest.common import rest_client
from tempest.common import xml_utils from tempest.common import xml_utils
from tempest import config from tempest import config

View File

@ -15,6 +15,7 @@
import urllib import urllib
from lxml import etree from lxml import etree
from tempest.common import rest_client from tempest.common import rest_client
from tempest.common import xml_utils from tempest.common import xml_utils
from tempest import config from tempest import config

View File

@ -13,9 +13,10 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from lxml import etree
import urllib import urllib
from lxml import etree
from tempest.common import rest_client from tempest.common import rest_client
from tempest.common import xml_utils from tempest.common import xml_utils
from tempest import config from tempest import config

View File

@ -10,9 +10,10 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from lxml import etree
import xml.etree.ElementTree as ET import xml.etree.ElementTree as ET
from lxml import etree
from tempest.common import rest_client from tempest.common import rest_client
from tempest.common import xml_utils as common from tempest.common import xml_utils as common
from tempest.services.network import network_client_base as client_base from tempest.services.network import network_client_base as client_base

View File

@ -15,12 +15,12 @@
import json import json
import urllib import urllib
from xml.etree import ElementTree as etree
from tempest.common import http from tempest.common import http
from tempest.common import rest_client from tempest.common import rest_client
from tempest import config from tempest import config
from tempest import exceptions from tempest import exceptions
from xml.etree import ElementTree as etree
CONF = config.CONF CONF = config.CONF

View File

@ -15,10 +15,10 @@
import json import json
import urllib import urllib
from xml.etree import ElementTree as etree
from tempest.common import rest_client from tempest.common import rest_client
from tempest import config from tempest import config
from xml.etree import ElementTree as etree
CONF = config.CONF CONF = config.CONF

View File

@ -14,9 +14,10 @@
# under the License. # under the License.
import abc import abc
import six
import urllib import urllib
import six
from tempest import config from tempest import config
CONF = config.CONF CONF = config.CONF

View File

@ -16,10 +16,9 @@
import urllib import urllib
from tempest.openstack.common import jsonutils
from tempest.common import rest_client from tempest.common import rest_client
from tempest import config from tempest import config
from tempest.openstack.common import jsonutils
CONF = config.CONF CONF = config.CONF

View File

@ -15,6 +15,7 @@
# under the License. # under the License.
import ast import ast
from lxml import etree from lxml import etree
from tempest.common import xml_utils as xml from tempest.common import xml_utils as xml

View File

@ -15,9 +15,9 @@
import time import time
import urllib import urllib
from xml.sax import saxutils
from lxml import etree from lxml import etree
from xml.sax import saxutils
from tempest.common import rest_client from tempest.common import rest_client
from tempest.common import xml_utils as common from tempest.common import xml_utils as common

View File

@ -13,7 +13,6 @@
# under the License. # under the License.
import mock import mock
from oslotest import base from oslotest import base
from oslotest import moxstubout from oslotest import moxstubout

View File

@ -13,6 +13,7 @@
# under the License. # under the License.
import copy import copy
import httplib2 import httplib2

View File

@ -13,9 +13,9 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import json
import httplib2 import httplib2
import json
TOKEN = "fake_token" TOKEN = "fake_token"

View File

@ -12,9 +12,10 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import mock
import subprocess import subprocess
import mock
from tempest.common import commands from tempest.common import commands
from tempest.tests import base from tempest.tests import base

View File

@ -15,9 +15,10 @@
import httplib import httplib
import json import json
import socket
import mock import mock
import six import six
import socket
from tempest.common import glance_http from tempest.common import glance_http
from tempest import exceptions from tempest import exceptions

View File

@ -12,9 +12,9 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import httplib2
import json import json
import httplib2
from oslotest import mockpatch from oslotest import mockpatch
from tempest.common import rest_client from tempest.common import rest_client

View File

@ -335,9 +335,11 @@ class TestTenantIsolation(base.TestCase):
remove_router_interface_mock = self.patch( remove_router_interface_mock = self.patch(
'tempest.services.network.json.network_client.NetworkClientJSON.' 'tempest.services.network.json.network_client.NetworkClientJSON.'
'remove_router_interface_with_subnet_id') 'remove_router_interface_with_subnet_id')
return_values = ({'status': 200}, {'ports': []})
port_list_mock = mock.patch.object(iso_creds.network_admin_client, port_list_mock = mock.patch.object(iso_creds.network_admin_client,
'list_ports', return_value=( 'list_ports',
{'status': 200}, {'ports': []})) return_value=return_values)
port_list_mock.start() port_list_mock.start()
iso_creds.clear_isolated_creds() iso_creds.clear_isolated_creds()
# Verify remove router interface calls # Verify remove router interface calls

View File

@ -17,7 +17,6 @@ import contextlib
import logging as orig_logging import logging as orig_logging
import os import os
import re import re
import six
import urlparse import urlparse
import boto import boto
@ -25,6 +24,7 @@ from boto import ec2
from boto import exception from boto import exception
from boto import s3 from boto import s3
import keystoneclient.exceptions import keystoneclient.exceptions
import six
import tempest.clients import tempest.clients
from tempest.common.utils import file_utils from tempest.common.utils import file_utils

View File

@ -22,6 +22,7 @@ import re
import StringIO import StringIO
import sys import sys
import urllib2 import urllib2
import yaml import yaml

View File

@ -42,10 +42,10 @@
"""Display a subunit stream through a colorized unittest test runner.""" """Display a subunit stream through a colorized unittest test runner."""
import heapq import heapq
import subunit
import sys import sys
import unittest import unittest
import subunit
import testtools import testtools

View File

@ -16,12 +16,13 @@
# under the License. # under the License.
import gzip import gzip
import pprint
import re import re
import StringIO import StringIO
import sys import sys
import urllib2 import urllib2
import pprint
pp = pprint.PrettyPrinter() pp = pprint.PrettyPrinter()
NOVA_TIMESTAMP = r"\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d\.\d\d\d" NOVA_TIMESTAMP = r"\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d\.\d\d\d"

View File

@ -109,7 +109,8 @@ import_exceptions = tempest.services
[flake8] [flake8]
# E125 is a won't fix until https://github.com/jcrocholl/pep8/issues/126 is resolved. For further detail see https://review.openstack.org/#/c/36788/ # E125 is a won't fix until https://github.com/jcrocholl/pep8/issues/126 is resolved. For further detail see https://review.openstack.org/#/c/36788/
# H402 skipped because some docstrings aren't sentences # H402 skipped because some docstrings aren't sentences
# Skipped because of new hacking 0.9: H407,H405,H904,H305,E123,H307,E122,E129,E128 # E123 skipped because it is ignored by default in the default pep8
ignore = E125,H402,H404,H407,H405,H904,H305,E123,H307,E122,E129,E128 # Skipped because of new hacking 0.9: H405,H904,E129,E128
ignore = E125,H402,E123,H404,H405,H904,E129,E128
show-source = True show-source = True
exclude = .git,.venv,.tox,dist,doc,openstack,*egg exclude = .git,.venv,.tox,dist,doc,openstack,*egg