diff options
author | Sushil Kumar <sushil.kumar3@hp.com> | 2015-05-20 19:53:12 +0000 |
---|---|---|
committer | Sushil Kumar <sushil.kumar3@hp.com> | 2015-05-29 07:27:59 +0000 |
commit | 843bb0cd53f6cc3caa9beeb8f07a374943d01889 (patch) | |
tree | 1d3669e320affdd4f59cd88c404ef420b1e0cfd4 /run_tests.py | |
parent | 0f3d24254811906810552217cf05ed9409f415fc (diff) | |
download | trove-843bb0cd53f6cc3caa9beeb8f07a374943d01889.tar.gz |
Fixes hacking rules
This patchset helps reducing the ignored pep8 errors.
Fixed some ignored hacking rules, as listed follows:
- E111 indentation is not a multiple of four
- E122 continuation line missing indentation or outdented
- E123 closing bracket does not match indentation of opening bracket's line
- E128 continuation line under-indented for visual indent
- E251 unexpected spaces around keyword / parameter equals
- E265 block comment should start with '# '
- E713 test for membership should be 'not in'
- H105 Don't use author tags
- H306 imports not in alphabetical order
Change-Id: Iadf2af4f6ec90420153ad63b5a41650392ef2cbd
Diffstat (limited to 'run_tests.py')
-rw-r--r-- | run_tests.py | 69 |
1 files changed, 32 insertions, 37 deletions
diff --git a/run_tests.py b/run_tests.py index 64dbacdd..7b89a8e1 100644 --- a/run_tests.py +++ b/run_tests.py @@ -19,22 +19,23 @@ import functools import gettext import os -import urllib import sys import traceback +import urllib + +import eventlet +import proboscis +import wsgi_intercept +from wsgi_intercept.httplib2_intercept import install as wsgi_install from trove.common import cfg -from trove.common import utils from trove.common.rpc import service as rpc_service from trove.common.rpc import version as rpc_version +from trove.common import utils from trove.openstack.common import log as logging -from trove.tests.config import CONFIG from trove import rpc -from wsgi_intercept.httplib2_intercept import install as wsgi_install -import proboscis -import wsgi_intercept +from trove.tests.config import CONFIG -import eventlet eventlet.monkey_patch(thread=False) CONF = cfg.CONF @@ -77,13 +78,12 @@ def initialize_trove(config_file): def datastore_init(): # Adds the datastore for mysql (needed to make most calls work). - from trove.datastore import models from trove.configuration.models import DatastoreConfigurationParameters + from trove.datastore import models - models.DBDatastore.create(id=CONFIG.dbaas_datastore_id, - name=CONFIG.dbaas_datastore, - default_version_id= - CONFIG.dbaas_datastore_version_id) + models.DBDatastore.create( + id=CONFIG.dbaas_datastore_id, name=CONFIG.dbaas_datastore, + default_version_id=CONFIG.dbaas_datastore_version_id) models.DBDatastore.create(id=utils.generate_uuid(), name=CONFIG.dbaas_datastore_name_no_versions, @@ -91,22 +91,18 @@ def datastore_init(): main_dsv = models.DBDatastoreVersion.create( id=CONFIG.dbaas_datastore_version_id, - datastore_id= - CONFIG.dbaas_datastore_id, + datastore_id=CONFIG.dbaas_datastore_id, name=CONFIG.dbaas_datastore_version, manager="mysql", - image_id= - 'c00000c0-00c0-0c00-00c0-000c000000cc', + image_id='c00000c0-00c0-0c00-00c0-000c000000cc', packages='test packages', active=1) - models.DBDatastoreVersion.create(id="d00000d0-00d0-0d00-00d0-000d000000dd", - datastore_id= - CONFIG.dbaas_datastore_id, - name='mysql_inactive_version', - manager="mysql", - image_id= - 'c00000c0-00c0-0c00-00c0-000c000000cc', - packages=None, active=0) + models.DBDatastoreVersion.create( + id="d00000d0-00d0-0d00-00d0-000d000000dd", + datastore_id=CONFIG.dbaas_datastore_id, + name='mysql_inactive_version', manager="mysql", + image_id='c00000c0-00c0-0c00-00c0-000c000000cc', + packages=None, active=0) def add_parm(name, data_type, max_size, min_size=0, restart_required=0): DatastoreConfigurationParameters.create( @@ -148,7 +144,6 @@ def initialize_fakes(app): path_info = env.get('PATH_INFO') if path_info: env['PATH_INFO'] = urllib.unquote(path_info) - #print("%s %s" % (args, kwargs)) return app.__call__(env, start_response) return call_back @@ -200,30 +195,30 @@ def run_tests(repl): def import_tests(): # F401 unused imports needed for tox tests from trove.tests.api import backups # noqa - from trove.tests.api import header # noqa - from trove.tests.api import limits # noqa + from trove.tests.api import configurations # noqa + from trove.tests.api import databases # noqa + from trove.tests.api import datastores # noqa from trove.tests.api import flavors # noqa - from trove.tests.api import versions # noqa + from trove.tests.api import header # noqa from trove.tests.api import instances as rd_instances # noqa from trove.tests.api import instances_actions as rd_actions # noqa from trove.tests.api import instances_delete # noqa from trove.tests.api import instances_mysql_down # noqa from trove.tests.api import instances_resize # noqa - from trove.tests.api import configurations # noqa - from trove.tests.api import databases # noqa - from trove.tests.api import datastores # noqa - from trove.tests.api import replication # noqa - from trove.tests.api import root # noqa - from trove.tests.api import root_on_create # noqa - from trove.tests.api import users # noqa - from trove.tests.api import user_access # noqa + from trove.tests.api import limits # noqa from trove.tests.api.mgmt import accounts # noqa from trove.tests.api.mgmt import admin_required # noqa from trove.tests.api.mgmt import hosts # noqa from trove.tests.api.mgmt import instances as mgmt_instances # noqa from trove.tests.api.mgmt import instances_actions as mgmt_actions # noqa - from trove.tests.api.mgmt import storage # noqa from trove.tests.api.mgmt import malformed_json # noqa + from trove.tests.api.mgmt import storage # noqa + from trove.tests.api import replication # noqa + from trove.tests.api import root # noqa + from trove.tests.api import root_on_create # noqa + from trove.tests.api import user_access # noqa + from trove.tests.api import users # noqa + from trove.tests.api import versions # noqa from trove.tests.db import migrations # noqa |