From 93ab8a13f55857f0117b5ecc5f3f51b7f42a44e6 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Mon, 12 Dec 2016 08:29:50 -0500
Subject: [PATCH] Style tests for updated flake8 libraries.
---
pulsar/client/action_mapper.py | 6 ++++--
pulsar/client/config_util.py | 1 +
pulsar/client/manager.py | 7 ++++---
pulsar/client/path_mapper.py | 3 ++-
pulsar/client/staging/down.py | 3 ++-
pulsar/client/test/check.py | 1 +
pulsar/client/transport/__init__.py | 7 ++++---
pulsar/main.py | 1 +
pulsar/managers/base/base_drmaa.py | 3 ++-
pulsar/managers/staging/post.py | 3 ++-
pulsar/managers/staging/pre.py | 3 ++-
pulsar/managers/stateful.py | 3 ++-
pulsar/messaging/bind_amqp.py | 1 +
pulsar/scripts/chown_working_directory.py | 1 +
pulsar/scripts/drmaa_kill.py | 1 +
pulsar/tools/authorization.py | 3 ++-
test/scripts_config_test.py | 1 +
test/test_utils.py | 1 +
18 files changed, 34 insertions(+), 15 deletions(-)
diff --git a/pulsar/client/action_mapper.py b/pulsar/client/action_mapper.py
index 6d698592..122d4abd 100644
--- a/pulsar/client/action_mapper.py
+++ b/pulsar/client/action_mapper.py
@@ -666,6 +666,7 @@ class RegexPathMapper(BasePathMapper):
def to_dict(self):
return self._extend_base_dict(path=self.pattern_raw)
+
MAPPER_CLASSES = [PrefixPathMapper, GlobPathMapper, RegexPathMapper]
MAPPER_CLASS_DICT = dict(map(lambda c: (c.match_type, c), MAPPER_CLASSES))
@@ -699,6 +700,7 @@ class FileLister(object):
depth -= 1
return dict([(join(path, f), f) for f in directory_files(path)])
+
DEFAULT_FILE_LISTER = FileLister(dict(depth=0))
ACTION_CLASSES = [
@@ -714,10 +716,10 @@ ACTION_CLASSES = [
actions = dict([(clazz.action_type, clazz) for clazz in ACTION_CLASSES])
-__all__ = [
+__all__ = (
'FileActionMapper',
'path_type',
'from_dict',
'MessageAction',
'RemoteTransferAction', # For testing
-]
+)
diff --git a/pulsar/client/config_util.py b/pulsar/client/config_util.py
index a128ca1d..37c45e88 100644
--- a/pulsar/client/config_util.py
+++ b/pulsar/client/config_util.py
@@ -70,6 +70,7 @@ def __read_json(path):
with open(path, "rb") as f:
return json.load(reader(f))
+
EXT_READERS = {
CONFIG_TYPE_JSON: __read_json,
CONFIG_TYPE_YAML: __read_yaml,
diff --git a/pulsar/client/manager.py b/pulsar/client/manager.py
index 459efa09..3202d1a3 100644
--- a/pulsar/client/manager.py
+++ b/pulsar/client/manager.py
@@ -298,8 +298,9 @@ def _environ_default_int(variable, default="0"):
int_val = int(val)
return int_val
-__all__ = [
+
+__all__ = (
'ClientManager',
'ObjectStoreClientManager',
- 'HttpPulsarInterface'
-]
+ 'HttpPulsarInterface',
+)
diff --git a/pulsar/client/path_mapper.py b/pulsar/client/path_mapper.py
index 4ab8805b..c3a3d58b 100644
--- a/pulsar/client/path_mapper.py
+++ b/pulsar/client/path_mapper.py
@@ -99,4 +99,5 @@ class PathMapper(object):
message = "PathMapper cannot handle path type %s" % dataset_path_type
raise Exception(message)
-__all__ = ['PathMapper']
+
+__all__ = ('PathMapper')
diff --git a/pulsar/client/staging/down.py b/pulsar/client/staging/down.py
index afdd1cec..96e606f3 100644
--- a/pulsar/client/staging/down.py
+++ b/pulsar/client/staging/down.py
@@ -173,4 +173,5 @@ def _clean(collection_failure_exceptions, cleanup_job, client):
except Exception:
log.warn("Failed to cleanup remote Pulsar job")
-__all__ = ['finish_job']
+
+__all__ = ('finish_job')
diff --git a/pulsar/client/test/check.py b/pulsar/client/test/check.py
index c9b2f8ab..1fbb560d 100644
--- a/pulsar/client/test/check.py
+++ b/pulsar/client/test/check.py
@@ -481,5 +481,6 @@ def main(argv=None):
(options, args) = parser.parse_args(argv)
run(options)
+
if __name__ == "__main__":
main()
diff --git a/pulsar/client/transport/__init__.py b/pulsar/client/transport/__init__.py
index a1a0f7de..a022c971 100644
--- a/pulsar/client/transport/__init__.py
+++ b/pulsar/client/transport/__init__.py
@@ -40,12 +40,13 @@ def _get_transport_type(transport_type, os_module):
transport_type = 'curl'
return transport_type
-__all__ = [
+
+__all__ = (
'get_transport',
'get_file',
'post_file',
'rsync_get_file',
'rsync_post_file',
'scp_get_file',
- 'scp_post_file'
-]
+ 'scp_post_file',
+)
diff --git a/pulsar/main.py b/pulsar/main.py
index 56a596b5..eae928c5 100644
--- a/pulsar/main.py
+++ b/pulsar/main.py
@@ -301,5 +301,6 @@ def main(argv=None):
else:
app_loop(args, log)
+
if __name__ == "__main__":
main()
diff --git a/pulsar/managers/base/base_drmaa.py b/pulsar/managers/base/base_drmaa.py
index 7358b482..2f6fedd1 100644
--- a/pulsar/managers/base/base_drmaa.py
+++ b/pulsar/managers/base/base_drmaa.py
@@ -77,4 +77,5 @@ class BaseDrmaaManager(ExternalBaseManager):
log.debug("Not native specification supplied, DRMAA job will be submitted with default parameters.")
return attributes
-__all__ = ["BaseDrmaaManager"]
+
+__all__ = ("BaseDrmaaManager")
diff --git a/pulsar/managers/staging/post.py b/pulsar/managers/staging/post.py
index 4edf8e4f..7991a370 100644
--- a/pulsar/managers/staging/post.py
+++ b/pulsar/managers/staging/post.py
@@ -69,4 +69,5 @@ def __pulsar_outputs(job_directory):
metadata_directory_contents,
)
-__all__ = ['postprocess']
+
+__all__ = ('postprocess')
diff --git a/pulsar/managers/staging/pre.py b/pulsar/managers/staging/pre.py
index 90100820..5469615f 100644
--- a/pulsar/managers/staging/pre.py
+++ b/pulsar/managers/staging/pre.py
@@ -16,4 +16,5 @@ def preprocess(job_directory, setup_actions, action_executor):
log.debug(description)
action_executor.execute(lambda: action.write_to_path(path), "action[%s]" % description)
-__all__ = ['preprocess']
+
+__all__ = ('preprocess')
diff --git a/pulsar/managers/stateful.py b/pulsar/managers/stateful.py
index 1ced1689..c16e34c5 100644
--- a/pulsar/managers/stateful.py
+++ b/pulsar/managers/stateful.py
@@ -305,4 +305,5 @@ def new_thread_for_manager(manager, name, target, daemon):
thread.start()
return thread
-__all__ = ['StatefulManagerProxy']
+
+__all__ = ('StatefulManagerProxy')
diff --git a/pulsar/messaging/bind_amqp.py b/pulsar/messaging/bind_amqp.py
index b17c7e24..3cc280bd 100644
--- a/pulsar/messaging/bind_amqp.py
+++ b/pulsar/messaging/bind_amqp.py
@@ -82,6 +82,7 @@ def __start_consumer(name, exchange, target):
thread.start()
return thread
+
start_setup_consumer = functools.partial(__start_consumer, "setup")
start_kill_consumer = functools.partial(__start_consumer, "kill")
start_status_update_ack_consumer = functools.partial(__start_consumer, "status_update_ack")
diff --git a/pulsar/scripts/chown_working_directory.py b/pulsar/scripts/chown_working_directory.py
index 970e13ed..0e9b7abc 100644
--- a/pulsar/scripts/chown_working_directory.py
+++ b/pulsar/scripts/chown_working_directory.py
@@ -32,5 +32,6 @@ def main(argv=None):
command = "chown -R '%s' '%s'" % (user, job_directory)
system(command)
+
if __name__ == "__main__":
main()
diff --git a/pulsar/scripts/drmaa_kill.py b/pulsar/scripts/drmaa_kill.py
index 6401afa2..2e6915ba 100644
--- a/pulsar/scripts/drmaa_kill.py
+++ b/pulsar/scripts/drmaa_kill.py
@@ -14,5 +14,6 @@ def main(argv=None):
session = DrmaaSessionFactory().get()
external_id = session.kill(external_id)
+
if __name__ == "__main__":
main()
diff --git a/pulsar/tools/authorization.py b/pulsar/tools/authorization.py
index 1a6a8bfb..74cb967e 100644
--- a/pulsar/tools/authorization.py
+++ b/pulsar/tools/authorization.py
@@ -87,4 +87,5 @@ def get_authorizer(toolbox):
authorizer = AllowAnyAuthorizer()
return authorizer
-__all__ = ['get_authorizer']
+
+__all__ = ('get_authorizer')
diff --git a/test/scripts_config_test.py b/test/scripts_config_test.py
index b4f95367..64d7fafb 100644
--- a/test/scripts_config_test.py
+++ b/test/scripts_config_test.py
@@ -131,6 +131,7 @@ def _check_project_directory(project_dir):
return Project(ini_config, app_config)
+
Project = collections.namedtuple('Project', ['ini_config', 'app_config'])
diff --git a/test/test_utils.py b/test/test_utils.py
index 238a830e..a1498b61 100644
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -54,6 +54,7 @@ def timed(timeout):
return outer_wrapper
+
INTEGRATION_MAXIMUM_TEST_TIME = 15
integration_test = timed(INTEGRATION_MAXIMUM_TEST_TIME)
--
GitLab