You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by wi...@apache.org on 2014/05/13 03:18:46 UTC
[1/3] Apply build-support/isort-run
Repository: incubator-aurora
Updated Branches:
refs/heads/master 904232439 -> 1c058f721
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/executor/common/test_directory_sandbox.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/executor/common/test_directory_sandbox.py b/src/test/python/apache/aurora/executor/common/test_directory_sandbox.py
index d896aed..3b9e145 100644
--- a/src/test/python/apache/aurora/executor/common/test_directory_sandbox.py
+++ b/src/test/python/apache/aurora/executor/common/test_directory_sandbox.py
@@ -16,12 +16,11 @@
import os
-from apache.aurora.executor.common.sandbox import DirectorySandbox, SandboxInterface
-
-from twitter.common.contextutil import temporary_dir
-
import mock
import pytest
+from twitter.common.contextutil import temporary_dir
+
+from apache.aurora.executor.common.sandbox import DirectorySandbox, SandboxInterface
def test_directory_sandbox():
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/executor/common/test_health_checker.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/executor/common/test_health_checker.py b/src/test/python/apache/aurora/executor/common/test_health_checker.py
index 384d9f6..37622a3 100644
--- a/src/test/python/apache/aurora/executor/common/test_health_checker.py
+++ b/src/test/python/apache/aurora/executor/common/test_health_checker.py
@@ -17,12 +17,11 @@
import time
import unittest
+import mox
from twitter.common.testing.clock import ThreadedClock
from apache.aurora.executor.common.health_checker import HealthCheckerThread
-import mox
-
def thread_yield():
time.sleep(0.1)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/executor/common/test_status_checker.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/executor/common/test_status_checker.py b/src/test/python/apache/aurora/executor/common/test_status_checker.py
index c87c101..42c3300 100644
--- a/src/test/python/apache/aurora/executor/common/test_status_checker.py
+++ b/src/test/python/apache/aurora/executor/common/test_status_checker.py
@@ -21,7 +21,7 @@ from apache.aurora.executor.common.status_checker import (
ExitState,
Healthy,
StatusChecker,
- StatusResult,
+ StatusResult
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/executor/common/test_task_info.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/executor/common/test_task_info.py b/src/test/python/apache/aurora/executor/common/test_task_info.py
index a840a57..acb2e3d 100644
--- a/src/test/python/apache/aurora/executor/common/test_task_info.py
+++ b/src/test/python/apache/aurora/executor/common/test_task_info.py
@@ -22,16 +22,11 @@ from apache.aurora.config.schema.base import (
MesosTaskInstance,
Process,
Resources,
- Task,
+ Task
)
from apache.aurora.executor.common.task_info import mesos_task_instance_from_assigned_task
-from gen.apache.aurora.api.ttypes import (
- AssignedTask,
- ExecutorConfig,
- TaskConfig,
-)
-
+from gen.apache.aurora.api.ttypes import AssignedTask, ExecutorConfig, TaskConfig
BASE_MTI = MesosTaskInstance(instance = 0, role = getpass.getuser())
BASE_TASK = Task(resources = Resources(cpu=1.0, ram=16*MB, disk=32*MB))
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/executor/test_executor_detector.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/executor/test_executor_detector.py b/src/test/python/apache/aurora/executor/test_executor_detector.py
index 951ae65..ff58d5a 100644
--- a/src/test/python/apache/aurora/executor/test_executor_detector.py
+++ b/src/test/python/apache/aurora/executor/test_executor_detector.py
@@ -17,10 +17,11 @@
import itertools
import os
-from apache.aurora.executor.executor_detector import ExecutorDetector
from twitter.common.contextutil import temporary_dir
from twitter.common.dirutil import safe_mkdir
+from apache.aurora.executor.executor_detector import ExecutorDetector
+
class Match(object):
def __init__(self, root, slave, framework, executor, run):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/executor/test_executor_vars.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/executor/test_executor_vars.py b/src/test/python/apache/aurora/executor/test_executor_vars.py
index 685d6ce..888d35e 100644
--- a/src/test/python/apache/aurora/executor/test_executor_vars.py
+++ b/src/test/python/apache/aurora/executor/test_executor_vars.py
@@ -14,7 +14,7 @@
# limitations under the License.
#
-from twitter.common.contextutil import temporary_file, open_zip
+from twitter.common.contextutil import open_zip, temporary_file
from apache.aurora.executor.executor_vars import ExecutorVars
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/executor/test_gc_executor.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/executor/test_gc_executor.py b/src/test/python/apache/aurora/executor/test_gc_executor.py
index baf3770..cf7ba52 100644
--- a/src/test/python/apache/aurora/executor/test_gc_executor.py
+++ b/src/test/python/apache/aurora/executor/test_gc_executor.py
@@ -14,15 +14,25 @@
# limitations under the License.
#
-from collections import namedtuple
import contextlib
import functools
-from itertools import product
import os
import shutil
import threading
import time
import unittest
+from collections import namedtuple
+from itertools import product
+
+import mesos_pb2 as mesos
+import mock
+from thrift.TSerialization import deserialize as thrift_deserialize
+from thrift.TSerialization import serialize as thrift_serialize
+from twitter.common.concurrent import deadline, Timeout
+from twitter.common.contextutil import temporary_dir
+from twitter.common.dirutil import safe_rmtree
+from twitter.common.quantity import Amount, Time
+from twitter.common.testing.clock import ThreadedClock
from apache.aurora.executor.gc_executor import ThermosGCExecutor
from apache.thermos.common.path import TaskPath
@@ -34,17 +44,6 @@ from gen.apache.aurora.api.ttypes import ScheduleStatus
from gen.apache.aurora.comm.ttypes import AdjustRetainedTasks, SchedulerMessage
from gen.apache.thermos.ttypes import ProcessState, TaskState
-import mock
-import mesos_pb2 as mesos
-from thrift.TSerialization import serialize as thrift_serialize
-from thrift.TSerialization import deserialize as thrift_deserialize
-from twitter.common.concurrent import deadline, Timeout
-from twitter.common.contextutil import temporary_dir
-from twitter.common.dirutil import safe_rmtree
-from twitter.common.quantity import Amount, Time
-from twitter.common.testing.clock import ThreadedClock
-
-
ACTIVE_TASKS = ('sleep60-lost',)
FINISHED_TASKS = {
@@ -648,4 +647,3 @@ class TestRealGC(unittest.TestCase):
task_id = self.setup_task(self.HELLO_WORLD, root, finished=True)
gcs = self.run_gc(root, task_id, retain=True)
assert len(gcs) == 0
-
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/executor/test_thermos_executor.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/executor/test_thermos_executor.py b/src/test/python/apache/aurora/executor/test_thermos_executor.py
index 0b143d0..c418943 100644
--- a/src/test/python/apache/aurora/executor/test_thermos_executor.py
+++ b/src/test/python/apache/aurora/executor/test_thermos_executor.py
@@ -14,8 +14,6 @@
# limitations under the License.
#
-from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer
-from collections import defaultdict
import getpass
import os
import signal
@@ -23,6 +21,17 @@ import subprocess
import tempfile
import threading
import time
+from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer
+from collections import defaultdict
+
+import mesos_pb2 as mesos_pb
+from thrift.TSerialization import serialize
+from twitter.common import log
+from twitter.common.contextutil import temporary_dir
+from twitter.common.dirutil import safe_mkdtemp, safe_rmtree
+from twitter.common.exceptions import ExceptionalThread
+from twitter.common.log.options import LogOptions
+from twitter.common.quantity import Amount, Time
from apache.aurora.config.schema.base import (
HealthCheckConfig,
@@ -31,8 +40,9 @@ from apache.aurora.config.schema.base import (
MesosTaskInstance,
Process,
Resources,
- Task,
+ Task
)
+from apache.aurora.executor.aurora_executor import AuroraExecutor
from apache.aurora.executor.common.executor_timeout import ExecutorTimeout
from apache.aurora.executor.common.health_checker import HealthCheckerProvider
from apache.aurora.executor.common.sandbox import DirectorySandbox, SandboxProvider
@@ -40,30 +50,14 @@ from apache.aurora.executor.common.task_runner import TaskError
from apache.aurora.executor.status_manager import StatusManager
from apache.aurora.executor.thermos_task_runner import (
DefaultThermosTaskRunnerProvider,
- ThermosTaskRunner,
+ ThermosTaskRunner
)
-from apache.aurora.executor.aurora_executor import AuroraExecutor
from apache.thermos.common.path import TaskPath
from apache.thermos.core.runner import TaskRunner
from apache.thermos.monitoring.monitor import TaskMonitor
from gen.apache.aurora.api.constants import AURORA_EXECUTOR_NAME
-from gen.apache.aurora.api.ttypes import (
- AssignedTask,
- ExecutorConfig,
- Identity,
- TaskConfig,
-)
-
-import mesos_pb2 as mesos_pb
-from thrift.TSerialization import serialize
-from twitter.common import log
-from twitter.common.contextutil import temporary_dir
-from twitter.common.dirutil import safe_mkdtemp, safe_rmtree
-from twitter.common.exceptions import ExceptionalThread
-from twitter.common.log.options import LogOptions
-from twitter.common.quantity import Amount, Time
-
+from gen.apache.aurora.api.ttypes import AssignedTask, ExecutorConfig, Identity, TaskConfig
if 'THERMOS_DEBUG' in os.environ:
LogOptions.set_stderr_log_level('google:DEBUG')
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/executor/test_thermos_task_runner.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/executor/test_thermos_task_runner.py b/src/test/python/apache/aurora/executor/test_thermos_task_runner.py
index e8c7c0e..51e8cde 100644
--- a/src/test/python/apache/aurora/executor/test_thermos_task_runner.py
+++ b/src/test/python/apache/aurora/executor/test_thermos_task_runner.py
@@ -22,22 +22,16 @@ import sys
import tempfile
import time
-from apache.aurora.config.schema.base import (
- MB,
- MesosTaskInstance,
- Process,
- Resources,
- Task,
-)
-from apache.aurora.executor.common.sandbox import DirectorySandbox
-from apache.aurora.executor.common.status_checker import ExitState
-from apache.aurora.executor.thermos_task_runner import ThermosTaskRunner
from twitter.common import log
-from twitter.common.log.options import LogOptions
+from twitter.common.contextutil import temporary_dir
from twitter.common.dirutil import safe_rmtree
+from twitter.common.log.options import LogOptions
from twitter.common.quantity import Amount, Time
-from twitter.common.contextutil import temporary_dir
+from apache.aurora.config.schema.base import MB, MesosTaskInstance, Process, Resources, Task
+from apache.aurora.executor.common.sandbox import DirectorySandbox
+from apache.aurora.executor.common.status_checker import ExitState
+from apache.aurora.executor.thermos_task_runner import ThermosTaskRunner
TASK = MesosTaskInstance(
instance=0,
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/thermos/common/test_planner.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/common/test_planner.py b/src/test/python/apache/thermos/common/test_planner.py
index 51feac9..30dff5d 100644
--- a/src/test/python/apache/thermos/common/test_planner.py
+++ b/src/test/python/apache/thermos/common/test_planner.py
@@ -15,6 +15,7 @@
#
import pytest
+
from apache.thermos.common.planner import Planner
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/thermos/common/test_task_planner.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/common/test_task_planner.py b/src/test/python/apache/thermos/common/test_task_planner.py
index 5ead7ff..d0548d6 100644
--- a/src/test/python/apache/thermos/common/test_task_planner.py
+++ b/src/test/python/apache/thermos/common/test_task_planner.py
@@ -16,10 +16,10 @@
import pytest
from twitter.common.testing.clock import ThreadedClock
+
from apache.thermos.common.planner import TaskPlanner
from apache.thermos.config.schema import *
-
p1 = Process(name = "p1", cmdline = "")
p2 = Process(name = "p2", cmdline = "")
p3 = Process(name = "p3", cmdline = "")
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/thermos/config/test_schema.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/config/test_schema.py b/src/test/python/apache/thermos/config/test_schema.py
index bd32076..163a36e 100644
--- a/src/test/python/apache/thermos/config/test_schema.py
+++ b/src/test/python/apache/thermos/config/test_schema.py
@@ -15,23 +15,23 @@
#
import pytest
-
from twitter.common.collections import OrderedDict
+
from apache.thermos.config.schema import (
- Constraint,
- List,
- Process,
- Resources,
- SequentialTask,
- SimpleTask,
- Task,
- Tasks,
- Units,
- combine_tasks,
- concat_tasks,
- java_options,
- order,
- python_options,
+ combine_tasks,
+ concat_tasks,
+ Constraint,
+ java_options,
+ List,
+ order,
+ Process,
+ python_options,
+ Resources,
+ SequentialTask,
+ SimpleTask,
+ Task,
+ Tasks,
+ Units
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/thermos/core/test_angry.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/core/test_angry.py b/src/test/python/apache/thermos/core/test_angry.py
index aece2e3..56b031d 100644
--- a/src/test/python/apache/thermos/core/test_angry.py
+++ b/src/test/python/apache/thermos/core/test_angry.py
@@ -16,9 +16,10 @@
import random
-from apache.thermos.config.schema import Task, Process
+from apache.thermos.config.schema import Process, Task
from apache.thermos.testing.runner import Runner
-from gen.apache.thermos.ttypes import TaskState, ProcessState
+
+from gen.apache.thermos.ttypes import ProcessState, TaskState
def flaky_task():
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/thermos/core/test_ephemerals.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/core/test_ephemerals.py b/src/test/python/apache/thermos/core/test_ephemerals.py
index 2d38449..25db723 100644
--- a/src/test/python/apache/thermos/core/test_ephemerals.py
+++ b/src/test/python/apache/thermos/core/test_ephemerals.py
@@ -14,15 +14,10 @@
# limitations under the License.
#
-from apache.thermos.config.schema import (
- Task,
- Resources,
- Process)
+from apache.thermos.config.schema import Process, Resources, Task
from apache.thermos.testing.runner import RunnerTestBase
-from gen.apache.thermos.ttypes import (
- TaskState,
- ProcessState
-)
+
+from gen.apache.thermos.ttypes import ProcessState, TaskState
class TestEphemeralTask(RunnerTestBase):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/thermos/core/test_failing_runner.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/core/test_failing_runner.py b/src/test/python/apache/thermos/core/test_failing_runner.py
index d14a188..5cf95ba 100644
--- a/src/test/python/apache/thermos/core/test_failing_runner.py
+++ b/src/test/python/apache/thermos/core/test_failing_runner.py
@@ -14,12 +14,11 @@
# limitations under the License.
#
-from apache.thermos.config.schema import Task, Resources, Process
+from apache.thermos.config.schema import Process, Resources, Task
from apache.thermos.testing.runner import RunnerTestBase
-from gen.apache.thermos.ttypes import (
- TaskState,
- ProcessState
-)
+
+from gen.apache.thermos.ttypes import ProcessState, TaskState
+
class TestFailingRunner(RunnerTestBase):
@classmethod
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/thermos/core/test_failure_limit.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/core/test_failure_limit.py b/src/test/python/apache/thermos/core/test_failure_limit.py
index 1769fbe..805bbd6 100644
--- a/src/test/python/apache/thermos/core/test_failure_limit.py
+++ b/src/test/python/apache/thermos/core/test_failure_limit.py
@@ -14,15 +14,11 @@
# limitations under the License.
#
-from apache.thermos.config.schema import (
- Task,
- Resources,
- Process)
+from apache.thermos.config.schema import Process, Resources, Task
from apache.thermos.testing.runner import RunnerTestBase
-from gen.apache.thermos.ttypes import (
- TaskState,
- ProcessState
-)
+
+from gen.apache.thermos.ttypes import ProcessState, TaskState
+
class TestFailureLimit(RunnerTestBase):
@classmethod
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/thermos/core/test_finalization.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/core/test_finalization.py b/src/test/python/apache/thermos/core/test_finalization.py
index feea2cd..86abab5 100644
--- a/src/test/python/apache/thermos/core/test_finalization.py
+++ b/src/test/python/apache/thermos/core/test_finalization.py
@@ -14,12 +14,9 @@
# limitations under the License.
#
-from apache.thermos.config.schema import (
- Constraint,
- Process,
- Task
-)
+from apache.thermos.config.schema import Constraint, Process, Task
from apache.thermos.testing.runner import RunnerTestBase
+
from gen.apache.thermos.ttypes import ProcessState, TaskState
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/thermos/core/test_helper.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/core/test_helper.py b/src/test/python/apache/thermos/core/test_helper.py
index beef25c..4efb617 100644
--- a/src/test/python/apache/thermos/core/test_helper.py
+++ b/src/test/python/apache/thermos/core/test_helper.py
@@ -16,18 +16,13 @@
import time
-from twitter.common.quantity import Time
-from apache.thermos.core.helper import TaskRunnerHelper as TRH
-
-from gen.apache.thermos.ttypes import (
- ProcessStatus,
- RunnerHeader,
- RunnerState,
-)
-
import mock
import psutil
+from twitter.common.quantity import Time
+
+from apache.thermos.core.helper import TaskRunnerHelper as TRH
+from gen.apache.thermos.ttypes import ProcessStatus, RunnerHeader, RunnerState
USER1 = 'user1'
PID = 12345
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/thermos/core/test_process.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/core/test_process.py b/src/test/python/apache/thermos/core/test_process.py
index e9afef8..4a25621 100644
--- a/src/test/python/apache/thermos/core/test_process.py
+++ b/src/test/python/apache/thermos/core/test_process.py
@@ -14,13 +14,15 @@
# limitations under the License.
#
-import os
import grp
+import os
import pwd
import random
import threading
import time
+import mock
+import pytest
from twitter.common.contextutil import temporary_dir
from twitter.common.dirutil import safe_mkdir
from twitter.common.recordio import ThriftRecordReader
@@ -30,9 +32,6 @@ from apache.thermos.core.process import Process
from gen.apache.thermos.ttypes import RunnerCkpt
-import mock
-import pytest
-
class TestProcess(Process):
def execute(self):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/thermos/core/test_runner_integration.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/core/test_runner_integration.py b/src/test/python/apache/thermos/core/test_runner_integration.py
index 91e2fb0..ce95b1c 100644
--- a/src/test/python/apache/thermos/core/test_runner_integration.py
+++ b/src/test/python/apache/thermos/core/test_runner_integration.py
@@ -17,22 +17,12 @@
import os
from textwrap import dedent
-from apache.thermos.config.schema import (
- order,
- Process,
- Resources,
- SequentialTask,
- Task,
- Tasks,
-)
-from apache.thermos.testing.runner import RunnerTestBase
+import pytest
-from gen.apache.thermos.ttypes import (
- TaskState,
- ProcessState
-)
+from apache.thermos.config.schema import order, Process, Resources, SequentialTask, Task, Tasks
+from apache.thermos.testing.runner import RunnerTestBase
-import pytest
+from gen.apache.thermos.ttypes import ProcessState, TaskState
class TestRunnerBasic(RunnerTestBase):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/thermos/core/test_staged_kill.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/core/test_staged_kill.py b/src/test/python/apache/thermos/core/test_staged_kill.py
index 2104a27..1c29433 100644
--- a/src/test/python/apache/thermos/core/test_staged_kill.py
+++ b/src/test/python/apache/thermos/core/test_staged_kill.py
@@ -20,22 +20,16 @@ import sys
import threading
import time
+import pytest
from twitter.common.process import ProcessProviderFactory
from twitter.common.quantity import Amount, Time
-from apache.thermos.config.schema import (
- Task,
- Resources,
- Process)
+
+from apache.thermos.config.schema import Process, Resources, Task
from apache.thermos.core.runner import TaskRunner
from apache.thermos.monitoring.monitor import TaskMonitor
from apache.thermos.testing.runner import Runner
-from gen.apache.thermos.ttypes import (
- TaskState,
- ProcessState
-)
-
-import pytest
+from gen.apache.thermos.ttypes import ProcessState, TaskState
sleepy_process = Process(
name = "sleepy",
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/thermos/monitoring/test_disk.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/monitoring/test_disk.py b/src/test/python/apache/thermos/monitoring/test_disk.py
index 582fb81..2465d18 100644
--- a/src/test/python/apache/thermos/monitoring/test_disk.py
+++ b/src/test/python/apache/thermos/monitoring/test_disk.py
@@ -16,16 +16,15 @@
import atexit
import os
-from tempfile import mkstemp
-import time
import sys
+import time
+from tempfile import mkstemp
-from twitter.common.quantity import Amount, Data, Time
+import pytest
from twitter.common.dirutil import safe_mkdtemp
-from apache.thermos.monitoring.disk import DiskCollector
-from apache.thermos.monitoring.disk import InotifyDiskCollector
+from twitter.common.quantity import Amount, Data, Time
-import pytest
+from apache.thermos.monitoring.disk import DiskCollector, InotifyDiskCollector
TEST_AMOUNT_1 = Amount(100, Data.MB)
TEST_AMOUNT_2 = Amount(10, Data.MB)
[3/3] git commit: Apply build-support/isort-run
Posted by wi...@apache.org.
Apply build-support/isort-run
This applies build-support/isort-run. This is an automatically generated
diff without any editing on my part. I sent this review with the git hook
enabled and it passed:
mba=aurora=; git commit -a -m "Apply build-support/isort-run"
Performing Python import order check.
SUCCESS
[wickman/apply_isort 17a14e6] Apply build-support/isort-run
169 files changed, 751 insertions(+), 1029 deletions(-)
Instructions for integrating it into your workflow are in the .isort.cfg at
the root of the repository.
Reviewed at https://reviews.apache.org/r/21333/
Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/1c058f72
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/1c058f72
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/1c058f72
Branch: refs/heads/master
Commit: 1c058f7217ea8df62110200919c7036a931b8076
Parents: 9042324
Author: Brian Wickman <wi...@apache.org>
Authored: Mon May 12 18:18:36 2014 -0700
Committer: Brian Wickman <wi...@apache.org>
Committed: Mon May 12 18:18:36 2014 -0700
----------------------------------------------------------------------
src/main/python/apache/aurora/__init__.py | 2 +-
.../apache/aurora/admin/host_maintenance.py | 8 +--
.../python/apache/aurora/client/__init__.py | 2 +-
.../python/apache/aurora/client/api/__init__.py | 15 +++---
.../apache/aurora/client/api/command_runner.py | 15 +++---
.../apache/aurora/client/api/disambiguator.py | 4 +-
.../apache/aurora/client/api/health_check.py | 4 +-
.../aurora/client/api/instance_watcher.py | 9 +---
.../apache/aurora/client/api/job_monitor.py | 14 ++---
.../apache/aurora/client/api/quota_check.py | 6 +--
.../apache/aurora/client/api/restarter.py | 6 +--
.../aurora/client/api/scheduler_client.py | 12 ++---
src/main/python/apache/aurora/client/api/sla.py | 9 +---
.../python/apache/aurora/client/api/updater.py | 23 ++++----
.../apache/aurora/client/api/updater_util.py | 1 +
src/main/python/apache/aurora/client/base.py | 6 +--
.../apache/aurora/client/bin/aurora_admin.py | 7 ++-
.../apache/aurora/client/bin/aurora_client.py | 13 ++---
.../apache/aurora/client/binding_helper.py | 2 +-
.../python/apache/aurora/client/cli/__init__.py | 3 +-
.../apache/aurora/client/cli/command_hooks.py | 8 +--
.../python/apache/aurora/client/cli/context.py | 15 +++---
.../python/apache/aurora/client/cli/jobs.py | 25 ++++-----
.../python/apache/aurora/client/cli/options.py | 6 +--
.../python/apache/aurora/client/cli/quota.py | 18 ++-----
src/main/python/apache/aurora/client/cli/sla.py | 10 ++--
.../python/apache/aurora/client/cli/task.py | 22 ++++----
.../apache/aurora/client/commands/admin.py | 24 ++++-----
.../apache/aurora/client/commands/core.py | 24 +++++----
.../apache/aurora/client/commands/help.py | 4 +-
.../aurora/client/commands/maintenance.py | 15 ++----
.../python/apache/aurora/client/commands/run.py | 11 ++--
.../python/apache/aurora/client/commands/ssh.py | 11 ++--
src/main/python/apache/aurora/client/config.py | 6 +--
src/main/python/apache/aurora/client/factory.py | 4 +-
.../apache/aurora/client/hooks/hooked_api.py | 4 +-
src/main/python/apache/aurora/client/options.py | 1 -
.../apache/aurora/common/aurora_job_key.py | 4 +-
.../apache/aurora/common/auth/__init__.py | 2 +-
.../apache/aurora/common/auth/auth_module.py | 3 +-
.../aurora/common/auth/auth_module_manager.py | 3 +-
.../apache/aurora/common/cluster_option.py | 5 +-
.../python/apache/aurora/common/clusters.py | 7 ++-
.../apache/aurora/common/http_signaler.py | 2 +-
.../python/apache/aurora/config/__init__.py | 7 +--
src/main/python/apache/aurora/config/loader.py | 4 +-
src/main/python/apache/aurora/config/recipes.py | 4 +-
src/main/python/apache/aurora/config/repl.py | 5 +-
src/main/python/apache/aurora/config/thrift.py | 36 ++++++-------
.../apache/aurora/executor/aurora_executor.py | 18 +++----
.../aurora/executor/bin/gc_executor_main.py | 8 +--
.../executor/bin/thermos_executor_main.py | 9 ++--
.../aurora/executor/bin/thermos_runner_main.py | 3 +-
.../aurora/executor/common/executor_timeout.py | 2 +-
.../aurora/executor/common/health_checker.py | 12 ++---
.../apache/aurora/executor/common/sandbox.py | 2 +-
.../apache/aurora/executor/common/task_info.py | 9 ++--
.../apache/aurora/executor/executor_vars.py | 6 +--
.../apache/aurora/executor/gc_executor.py | 34 ++++++------
.../apache/aurora/executor/status_manager.py | 4 +-
.../apache/aurora/executor/thermos_runner.py | 5 +-
.../aurora/executor/thermos_task_runner.py | 23 +++-----
.../aurora/tools/java/organize_imports.py | 1 -
.../aurora/tools/java/thrift_wrapper_codegen.py | 1 -
src/main/python/apache/thermos/bin/thermos.py | 39 ++++++--------
.../python/apache/thermos/bin/thermos_ckpt.py | 10 ++--
src/main/python/apache/thermos/common/ckpt.py | 15 +++---
.../python/apache/thermos/common/options.py | 1 +
.../python/apache/thermos/common/planner.py | 5 +-
.../apache/thermos/config/bin/config_load.py | 6 +--
.../apache/thermos/config/bin/config_repl.py | 4 +-
src/main/python/apache/thermos/config/loader.py | 7 +--
.../python/apache/thermos/config/schema_base.py | 14 +----
.../apache/thermos/config/schema_helpers.py | 9 +---
src/main/python/apache/thermos/core/helper.py | 17 +++---
.../python/apache/thermos/core/inspector.py | 14 ++---
src/main/python/apache/thermos/core/muxer.py | 6 +--
src/main/python/apache/thermos/core/process.py | 19 ++-----
src/main/python/apache/thermos/core/runner.py | 52 +++++++++---------
.../python/apache/thermos/monitoring/disk.py | 18 +++----
.../python/apache/thermos/monitoring/garbage.py | 12 ++---
.../python/apache/thermos/monitoring/monitor.py | 15 ++----
.../monitoring/process_collector_psutil.py | 9 ++--
.../apache/thermos/monitoring/resource.py | 16 +++---
.../thermos/observer/bin/thermos_observer.py | 7 ++-
.../thermos/observer/http/file_browser.py | 3 +-
.../thermos/observer/http/http_observer.py | 6 +--
.../python/apache/thermos/observer/http/json.py | 1 -
.../thermos/observer/http/static_assets.py | 2 +-
.../apache/thermos/observer/http/templating.py | 1 +
.../apache/thermos/observer/observed_task.py | 10 ++--
.../apache/thermos/observer/task_observer.py | 14 ++---
.../python/apache/thermos/testing/runner.py | 16 +++---
.../aurora/admin/test_host_maintenance.py | 13 ++---
.../aurora/client/api/test_disambiguator.py | 15 ++----
.../aurora/client/api/test_health_check.py | 14 ++---
.../aurora/client/api/test_instance_watcher.py | 8 +--
.../aurora/client/api/test_job_monitor.py | 15 +++---
.../aurora/client/api/test_quota_check.py | 8 +--
.../apache/aurora/client/api/test_restarter.py | 8 +--
.../aurora/client/api/test_scheduler_client.py | 11 ++--
.../python/apache/aurora/client/api/test_sla.py | 13 ++---
.../apache/aurora/client/api/test_updater.py | 55 ++++++++++----------
.../apache/aurora/client/cli/test_bridge.py | 1 -
.../aurora/client/cli/test_cancel_update.py | 8 +--
.../aurora/client/cli/test_command_hooks.py | 20 +++----
.../apache/aurora/client/cli/test_create.py | 19 +++----
.../apache/aurora/client/cli/test_diff.py | 13 ++---
.../apache/aurora/client/cli/test_help.py | 4 +-
.../apache/aurora/client/cli/test_kill.py | 8 ++-
.../apache/aurora/client/cli/test_logging.py | 12 ++---
.../apache/aurora/client/cli/test_open.py | 8 +--
.../apache/aurora/client/cli/test_plugins.py | 25 +++++----
.../apache/aurora/client/cli/test_quota.py | 9 ++--
.../apache/aurora/client/cli/test_restart.py | 11 ++--
.../python/apache/aurora/client/cli/test_sla.py | 4 +-
.../apache/aurora/client/cli/test_status.py | 18 +++----
.../apache/aurora/client/cli/test_task_run.py | 6 +--
.../apache/aurora/client/cli/test_update.py | 7 ++-
.../python/apache/aurora/client/cli/util.py | 18 +++----
.../aurora/client/commands/test_admin_sla.py | 9 ++--
.../client/commands/test_cancel_update.py | 12 ++---
.../aurora/client/commands/test_create.py | 11 ++--
.../apache/aurora/client/commands/test_diff.py | 10 ++--
.../apache/aurora/client/commands/test_hooks.py | 12 ++---
.../apache/aurora/client/commands/test_kill.py | 15 +++---
.../aurora/client/commands/test_listjobs.py | 13 ++---
.../aurora/client/commands/test_maintenance.py | 10 ++--
.../aurora/client/commands/test_restart.py | 10 ++--
.../apache/aurora/client/commands/test_run.py | 6 +--
.../apache/aurora/client/commands/test_ssh.py | 6 +--
.../aurora/client/commands/test_status.py | 10 ++--
.../aurora/client/commands/test_update.py | 18 +++----
.../apache/aurora/client/commands/util.py | 10 ++--
.../aurora/client/hooks/test_hooked_api.py | 9 ++--
.../aurora/client/hooks/test_non_hooked_api.py | 3 +-
.../apache/aurora/client/test_binding_helper.py | 8 +--
.../python/apache/aurora/client/test_config.py | 4 +-
.../apache/aurora/common/test_aurora_job_key.py | 1 +
.../python/apache/aurora/common/test_cluster.py | 10 ++--
.../apache/aurora/common/test_cluster_option.py | 4 +-
.../apache/aurora/common/test_clusters.py | 5 +-
.../apache/aurora/common/test_http_signaler.py | 5 +-
.../python/apache/aurora/config/test_base.py | 4 +-
.../aurora/config/test_constraint_parsing.py | 3 +-
.../python/apache/aurora/config/test_loader.py | 6 +--
.../python/apache/aurora/config/test_thrift.py | 33 ++++--------
.../executor/common/test_directory_sandbox.py | 7 ++-
.../executor/common/test_health_checker.py | 3 +-
.../executor/common/test_status_checker.py | 2 +-
.../aurora/executor/common/test_task_info.py | 9 +---
.../aurora/executor/test_executor_detector.py | 3 +-
.../aurora/executor/test_executor_vars.py | 2 +-
.../apache/aurora/executor/test_gc_executor.py | 26 +++++----
.../aurora/executor/test_thermos_executor.py | 36 ++++++-------
.../aurora/executor/test_thermos_task_runner.py | 18 +++----
.../apache/thermos/common/test_planner.py | 1 +
.../apache/thermos/common/test_task_planner.py | 2 +-
.../python/apache/thermos/config/test_schema.py | 30 +++++------
.../python/apache/thermos/core/test_angry.py | 5 +-
.../apache/thermos/core/test_ephemerals.py | 11 ++--
.../apache/thermos/core/test_failing_runner.py | 9 ++--
.../apache/thermos/core/test_failure_limit.py | 12 ++---
.../apache/thermos/core/test_finalization.py | 7 +--
.../python/apache/thermos/core/test_helper.py | 13 ++---
.../python/apache/thermos/core/test_process.py | 7 ++-
.../thermos/core/test_runner_integration.py | 18 ++-----
.../apache/thermos/core/test_staged_kill.py | 14 ++---
.../apache/thermos/monitoring/test_disk.py | 11 ++--
169 files changed, 751 insertions(+), 1029 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/__init__.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/__init__.py b/src/main/python/apache/aurora/__init__.py
index d54d88c..6cfe8d6 100644
--- a/src/main/python/apache/aurora/__init__.py
+++ b/src/main/python/apache/aurora/__init__.py
@@ -14,4 +14,4 @@
# limitations under the License.
#
-__import__('pkg_resources').declare_namespace(__name__)
\ No newline at end of file
+__import__('pkg_resources').declare_namespace(__name__)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/admin/host_maintenance.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/admin/host_maintenance.py b/src/main/python/apache/aurora/admin/host_maintenance.py
index 699caed..16c18bc 100644
--- a/src/main/python/apache/aurora/admin/host_maintenance.py
+++ b/src/main/python/apache/aurora/admin/host_maintenance.py
@@ -14,17 +14,17 @@
# limitations under the License.
#
-from collections import defaultdict
import time
+from collections import defaultdict
+
+from twitter.common import log
+from twitter.common.quantity import Amount, Time
from apache.aurora.client.api import AuroraClientAPI
from apache.aurora.client.base import check_and_log_response
from gen.apache.aurora.api.ttypes import Hosts, MaintenanceMode
-from twitter.common import log
-from twitter.common.quantity import Amount, Time
-
def group_by_host(hostname):
return hostname
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/client/__init__.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/__init__.py b/src/main/python/apache/aurora/client/__init__.py
index d54d88c..6cfe8d6 100644
--- a/src/main/python/apache/aurora/client/__init__.py
+++ b/src/main/python/apache/aurora/client/__init__.py
@@ -14,4 +14,4 @@
# limitations under the License.
#
-__import__('pkg_resources').declare_namespace(__name__)
\ No newline at end of file
+__import__('pkg_resources').declare_namespace(__name__)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/client/api/__init__.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/api/__init__.py b/src/main/python/apache/aurora/client/api/__init__.py
index eef9496..f671ed8 100644
--- a/src/main/python/apache/aurora/client/api/__init__.py
+++ b/src/main/python/apache/aurora/client/api/__init__.py
@@ -20,18 +20,19 @@ from apache.aurora.common.aurora_job_key import AuroraJobKey
from apache.aurora.common.auth import make_session_key
from apache.aurora.common.cluster import Cluster
+from .restarter import Restarter
+from .scheduler_client import SchedulerProxy
+from .sla import Sla
+from .updater import Updater
+
from gen.apache.aurora.api.constants import LIVE_STATES
from gen.apache.aurora.api.ttypes import (
- Response,
Identity,
ResourceAggregate,
+ Response,
ResponseCode,
- TaskQuery)
-
-from .restarter import Restarter
-from .scheduler_client import SchedulerProxy
-from .sla import Sla
-from .updater import Updater
+ TaskQuery
+)
class AuroraClientAPI(object):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/client/api/command_runner.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/api/command_runner.py b/src/main/python/apache/aurora/client/api/command_runner.py
index 1af6a78..14f8e45 100644
--- a/src/main/python/apache/aurora/client/api/command_runner.py
+++ b/src/main/python/apache/aurora/client/api/command_runner.py
@@ -14,23 +14,20 @@
# limitations under the License.
#
-from multiprocessing.pool import ThreadPool
import posixpath
import subprocess
+from multiprocessing.pool import ThreadPool
+
+from pystachio import Environment, Required, String
+from twitter.common import log
from apache.aurora.client.api import AuroraClientAPI
-from apache.aurora.config.schema.base import MesosContext
from apache.aurora.common.cluster import Cluster
+from apache.aurora.config.schema.base import MesosContext
from apache.thermos.config.schema import ThermosContext
from gen.apache.aurora.api.constants import LIVE_STATES
-from gen.apache.aurora.api.ttypes import (
- Identity,
- ResponseCode,
- TaskQuery)
-
-from pystachio import Environment, Required, String
-from twitter.common import log
+from gen.apache.aurora.api.ttypes import Identity, ResponseCode, TaskQuery
class CommandRunnerTrait(Cluster.Trait):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/client/api/disambiguator.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/api/disambiguator.py b/src/main/python/apache/aurora/client/api/disambiguator.py
index 18339b2..d163a18 100644
--- a/src/main/python/apache/aurora/client/api/disambiguator.py
+++ b/src/main/python/apache/aurora/client/api/disambiguator.py
@@ -14,12 +14,12 @@
# limitations under the License.
#
+from twitter.common import log
+
from apache.aurora.client.api import AuroraClientAPI
from apache.aurora.client.base import check_and_log_response, deprecation_warning, die
from apache.aurora.common.aurora_job_key import AuroraJobKey
-from twitter.common import log
-
class LiveJobDisambiguator(object):
"""
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/client/api/health_check.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/api/health_check.py b/src/main/python/apache/aurora/client/api/health_check.py
index e503344..5dd47aa 100644
--- a/src/main/python/apache/aurora/client/api/health_check.py
+++ b/src/main/python/apache/aurora/client/api/health_check.py
@@ -16,11 +16,11 @@
from abc import abstractmethod
-from gen.apache.aurora.api.ttypes import ScheduleStatus
-
from twitter.common import log
from twitter.common.lang import Interface
+from gen.apache.aurora.api.ttypes import ScheduleStatus
+
class HealthCheck(Interface):
@abstractmethod
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/client/api/instance_watcher.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/api/instance_watcher.py b/src/main/python/apache/aurora/client/api/instance_watcher.py
index 13a41d4..8992b93 100644
--- a/src/main/python/apache/aurora/client/api/instance_watcher.py
+++ b/src/main/python/apache/aurora/client/api/instance_watcher.py
@@ -16,16 +16,11 @@
import time
-from gen.apache.aurora.api.ttypes import (
- Identity,
- ResponseCode,
- ScheduleStatus,
- TaskQuery,
-)
+from twitter.common import log
from .health_check import StatusHealthCheck
-from twitter.common import log
+from gen.apache.aurora.api.ttypes import Identity, ResponseCode, ScheduleStatus, TaskQuery
class Instance(object):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/client/api/job_monitor.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/api/job_monitor.py b/src/main/python/apache/aurora/client/api/job_monitor.py
index a1a39e8..a27f6fb 100644
--- a/src/main/python/apache/aurora/client/api/job_monitor.py
+++ b/src/main/python/apache/aurora/client/api/job_monitor.py
@@ -16,19 +16,13 @@
import time
-from gen.apache.aurora.api.constants import (
- LIVE_STATES,
- TERMINAL_STATES
-)
-from gen.apache.aurora.api.ttypes import (
- Identity,
- TaskQuery
-)
-
from thrift.transport import TTransport
from twitter.common import log
from twitter.common.quantity import Amount, Time
+from gen.apache.aurora.api.constants import LIVE_STATES, TERMINAL_STATES
+from gen.apache.aurora.api.ttypes import Identity, TaskQuery
+
class JobMonitor(object):
MIN_POLL_INTERVAL = Amount(2, Time.SECONDS)
@@ -96,4 +90,4 @@ class JobMonitor(object):
self._clock.sleep(poll_interval.as_(Time.SECONDS))
poll_interval = min(self._max_poll_interval, 2 * poll_interval)
- return True
\ No newline at end of file
+ return True
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/client/api/quota_check.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/api/quota_check.py b/src/main/python/apache/aurora/client/api/quota_check.py
index da8e38e..cfb56d7 100644
--- a/src/main/python/apache/aurora/client/api/quota_check.py
+++ b/src/main/python/apache/aurora/client/api/quota_check.py
@@ -15,13 +15,12 @@
#
import operator
-
from copy import deepcopy
-from gen.apache.aurora.api.ttypes import ResourceAggregate, Response, ResponseCode
-
from twitter.common import log
+from gen.apache.aurora.api.ttypes import ResourceAggregate, Response, ResponseCode
+
class CapacityRequest(object):
"""Facilitates Quota manipulations."""
@@ -110,4 +109,3 @@ def print_quota(quota, msg, subj):
]
log.info('%s for %s:\n\t%s' %
(msg, subj, '\n\t'.join(['%s\t%s' % (k, v) for (k, v) in quota_fields])))
-
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/client/api/restarter.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/api/restarter.py b/src/main/python/apache/aurora/client/api/restarter.py
index d7945bf..bceba63 100644
--- a/src/main/python/apache/aurora/client/api/restarter.py
+++ b/src/main/python/apache/aurora/client/api/restarter.py
@@ -14,13 +14,13 @@
# limitations under the License.
#
-from gen.apache.aurora.api.constants import ACTIVE_STATES
-from gen.apache.aurora.api.ttypes import ResponseCode
+from twitter.common import log
from .instance_watcher import InstanceWatcher
from .updater_util import FailureThreshold
-from twitter.common import log
+from gen.apache.aurora.api.constants import ACTIVE_STATES
+from gen.apache.aurora.api.ttypes import ResponseCode
class Restarter(object):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/client/api/scheduler_client.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/api/scheduler_client.py b/src/main/python/apache/aurora/client/api/scheduler_client.py
index b298d8f..ff5d2bc 100644
--- a/src/main/python/apache/aurora/client/api/scheduler_client.py
+++ b/src/main/python/apache/aurora/client/api/scheduler_client.py
@@ -19,12 +19,6 @@ import threading
import time
import traceback
-from apache.aurora.common.auth import make_session_key, SessionKeyError
-from apache.aurora.common.cluster import Cluster
-
-from gen.apache.aurora.api import AuroraAdmin
-from gen.apache.aurora.api.constants import CURRENT_API_VERSION
-
from pystachio import Boolean, Default, Integer, String
from thrift.protocol import TBinaryProtocol
from thrift.transport import TSocket, TTransport
@@ -34,6 +28,12 @@ from twitter.common.rpc.transports.tsslsocket import DelayedHandshakeTSSLSocket
from twitter.common.zookeeper.kazoo_client import TwitterKazooClient
from twitter.common.zookeeper.serverset import ServerSet
+from apache.aurora.common.auth import make_session_key, SessionKeyError
+from apache.aurora.common.cluster import Cluster
+
+from gen.apache.aurora.api import AuroraAdmin
+from gen.apache.aurora.api.constants import CURRENT_API_VERSION
+
class SchedulerClientTrait(Cluster.Trait):
zk = String
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/client/api/sla.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/api/sla.py b/src/main/python/apache/aurora/client/api/sla.py
index decfd5d..a20b5d4 100644
--- a/src/main/python/apache/aurora/client/api/sla.py
+++ b/src/main/python/apache/aurora/client/api/sla.py
@@ -16,7 +16,6 @@
import math
import time
-
from collections import defaultdict, namedtuple
from copy import deepcopy
@@ -24,13 +23,7 @@ from apache.aurora.client.base import check_and_log_response
from apache.aurora.common.aurora_job_key import AuroraJobKey
from gen.apache.aurora.api.constants import LIVE_STATES
-from gen.apache.aurora.api.ttypes import (
- Identity,
- Response,
- ResponseCode,
- ScheduleStatus,
- TaskQuery
-)
+from gen.apache.aurora.api.ttypes import Identity, Response, ResponseCode, ScheduleStatus, TaskQuery
def job_key_from_scheduled(task, cluster):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/client/api/updater.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/api/updater.py b/src/main/python/apache/aurora/client/api/updater.py
index 2f55d5a..e8692ea 100644
--- a/src/main/python/apache/aurora/client/api/updater.py
+++ b/src/main/python/apache/aurora/client/api/updater.py
@@ -18,28 +18,29 @@ import json
from collections import namedtuple
from difflib import unified_diff
+from thrift.protocol import TJSONProtocol
+from thrift.TSerialization import serialize
+from twitter.common import log
+
+from .instance_watcher import InstanceWatcher
+from .job_monitor import JobMonitor
+from .quota_check import CapacityRequest, QuotaCheck
+from .scheduler_client import SchedulerProxy
+from .updater_util import FailureThreshold, UpdaterConfig
+
from gen.apache.aurora.api.constants import ACTIVE_STATES
from gen.apache.aurora.api.ttypes import (
AddInstancesConfig,
- JobKey,
Identity,
+ JobKey,
Lock,
LockKey,
LockValidation,
Response,
ResponseCode,
- TaskQuery,
+ TaskQuery
)
-from .instance_watcher import InstanceWatcher
-from .job_monitor import JobMonitor
-from .quota_check import CapacityRequest, QuotaCheck
-from .scheduler_client import SchedulerProxy
-from .updater_util import FailureThreshold, UpdaterConfig
-
-from thrift.protocol import TJSONProtocol
-from thrift.TSerialization import serialize
-from twitter.common import log
class Updater(object):
"""Update the instances of a job in batches."""
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/client/api/updater_util.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/api/updater_util.py b/src/main/python/apache/aurora/client/api/updater_util.py
index aabd1ca..5ea96cd 100644
--- a/src/main/python/apache/aurora/client/api/updater_util.py
+++ b/src/main/python/apache/aurora/client/api/updater_util.py
@@ -18,6 +18,7 @@ import collections
from twitter.common import log
+
class UpdaterConfig(object):
"""
For updates involving a health check,
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/client/base.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/base.py b/src/main/python/apache/aurora/client/base.py
index 9136e37..13730fd 100644
--- a/src/main/python/apache/aurora/client/base.py
+++ b/src/main/python/apache/aurora/client/base.py
@@ -14,16 +14,16 @@
# limitations under the License.
#
-from collections import defaultdict
import functools
import optparse
import sys
+from collections import defaultdict
from urlparse import urljoin
-from gen.apache.aurora.api.ttypes import ResponseCode
-
from twitter.common import app, log
+from gen.apache.aurora.api.ttypes import ResponseCode
+
LOCKED_WARNING = """
Note: if the scheduler detects that a job update is in progress (or was not
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/client/bin/aurora_admin.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/bin/aurora_admin.py b/src/main/python/apache/aurora/client/bin/aurora_admin.py
index 5a37ae7..04b9cc1 100644
--- a/src/main/python/apache/aurora/client/bin/aurora_admin.py
+++ b/src/main/python/apache/aurora/client/bin/aurora_admin.py
@@ -14,13 +14,12 @@
# limitations under the License.
#
-from apache.aurora.client.base import generate_terse_usage
-from apache.aurora.client.commands import admin, help, maintenance
-from apache.aurora.client.options import add_verbosity_options
-
from twitter.common import app
from twitter.common.log.options import LogOptions
+from apache.aurora.client.base import generate_terse_usage
+from apache.aurora.client.commands import admin, help, maintenance
+from apache.aurora.client.options import add_verbosity_options
app.register_commands_from(admin, help, maintenance)
add_verbosity_options()
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/client/bin/aurora_client.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/bin/aurora_client.py b/src/main/python/apache/aurora/client/bin/aurora_client.py
index 936d819..580bd0f 100644
--- a/src/main/python/apache/aurora/client/bin/aurora_client.py
+++ b/src/main/python/apache/aurora/client/bin/aurora_client.py
@@ -14,22 +14,17 @@
# limitations under the License.
#
-from apache.aurora.client.base import generate_terse_usage
-
from twitter.common import app
from twitter.common.log.options import LogOptions
+from apache.aurora.client.base import generate_terse_usage
+from apache.aurora.client.commands import core, help, run, ssh
+from apache.aurora.client.options import add_verbosity_options
+
# These are are side-effecting imports in that they register commands via
# app.command. This is a poor code practice and should be fixed long-term
# with the creation of twitter.common.cli that allows for argparse-style CLI
# composition.
-from apache.aurora.client.commands import (
- core,
- help,
- run,
- ssh,
-)
-from apache.aurora.client.options import add_verbosity_options
app.register_commands_from(core, run, ssh)
app.register_commands_from(help)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/client/binding_helper.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/binding_helper.py b/src/main/python/apache/aurora/client/binding_helper.py
index d1b2821..1009add 100644
--- a/src/main/python/apache/aurora/client/binding_helper.py
+++ b/src/main/python/apache/aurora/client/binding_helper.py
@@ -14,10 +14,10 @@
# limitations under the License.
#
-from abc import abstractmethod, abstractproperty
import inspect
import os
import sys
+from abc import abstractmethod, abstractproperty
from twitter.common.lang import Interface
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/client/cli/__init__.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/cli/__init__.py b/src/main/python/apache/aurora/client/cli/__init__.py
index efdc545..2beb9a0 100644
--- a/src/main/python/apache/aurora/client/cli/__init__.py
+++ b/src/main/python/apache/aurora/client/cli/__init__.py
@@ -32,14 +32,15 @@ For example:
from __future__ import print_function
-from abc import abstractmethod
import argparse
import getpass
import logging
import sys
+from abc import abstractmethod
from uuid import uuid1
from twitter.common.python.pex import PexInfo
+
from .command_hooks import GlobalCommandHookRegistry
# Constants for standard return codes.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/client/cli/command_hooks.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/cli/command_hooks.py b/src/main/python/apache/aurora/client/cli/command_hooks.py
index 196a0c1..fea6c4f 100644
--- a/src/main/python/apache/aurora/client/cli/command_hooks.py
+++ b/src/main/python/apache/aurora/client/cli/command_hooks.py
@@ -19,18 +19,18 @@
from __future__ import print_function
-from abc import abstractmethod
-from fnmatch import fnmatch
import getpass
import logging
import os
import sys
-
-from apache.aurora.client.cli.options import CommandOption
+from abc import abstractmethod
+from fnmatch import fnmatch
import requests
from twitter.common.lang import Compatibility
+from apache.aurora.client.cli.options import CommandOption
+
# Ugly workaround to avoid cyclic dependency.
EXIT_PERMISSION_VIOLATION = 8
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/client/cli/context.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/cli/context.py b/src/main/python/apache/aurora/client/cli/context.py
index a537eaa..fae30f6 100644
--- a/src/main/python/apache/aurora/client/cli/context.py
+++ b/src/main/python/apache/aurora/client/cli/context.py
@@ -15,27 +15,28 @@
#
from __future__ import print_function
-from collections import namedtuple
-from fnmatch import fnmatch
+
import logging
import sys
+from collections import namedtuple
+from fnmatch import fnmatch
+
+from twitter.common import log
-from apache.aurora.common.clusters import CLUSTERS
-from apache.aurora.common.aurora_job_key import AuroraJobKey
from apache.aurora.client.base import synthesize_url
from apache.aurora.client.cli import (
Context,
EXIT_API_ERROR,
EXIT_INVALID_CONFIGURATION,
- EXIT_INVALID_PARAMETER,
+ EXIT_INVALID_PARAMETER
)
from apache.aurora.client.config import get_config
from apache.aurora.client.factory import make_client
+from apache.aurora.common.aurora_job_key import AuroraJobKey
+from apache.aurora.common.clusters import CLUSTERS
from gen.apache.aurora.api.ttypes import ResponseCode
-from twitter.common import log
-
# Utility type, representing job keys with wildcards.
PartialJobKey = namedtuple('PartialJobKey', ['cluster', 'role', 'env', 'name'])
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/client/cli/jobs.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/cli/jobs.py b/src/main/python/apache/aurora/client/cli/jobs.py
index b50e37b..6fc08da 100644
--- a/src/main/python/apache/aurora/client/cli/jobs.py
+++ b/src/main/python/apache/aurora/client/cli/jobs.py
@@ -15,15 +15,20 @@
#
from __future__ import print_function
-from datetime import datetime
-import logging
+
import json
+import logging
import os
import pprint
import subprocess
import sys
-from tempfile import NamedTemporaryFile
import time
+from datetime import datetime
+from tempfile import NamedTemporaryFile
+
+from pystachio.config import Config
+from thrift.protocol import TJSONProtocol
+from thrift.TSerialization import serialize
from apache.aurora.client.api.job_monitor import JobMonitor
from apache.aurora.client.api.updater_util import UpdaterConfig
@@ -34,7 +39,7 @@ from apache.aurora.client.cli import (
EXIT_OK,
EXIT_TIMEOUT,
Noun,
- Verb,
+ Verb
)
from apache.aurora.client.cli.context import AuroraCommandContext
from apache.aurora.client.cli.options import (
@@ -53,20 +58,12 @@ from apache.aurora.client.cli.options import (
MAX_TOTAL_FAILURES_OPTION,
NO_BATCHING_OPTION,
STRICT_OPTION,
- WATCH_OPTION,
+ WATCH_OPTION
)
from apache.aurora.common.aurora_job_key import AuroraJobKey
from gen.apache.aurora.api.constants import ACTIVE_STATES, AURORA_EXECUTOR_NAME
-from gen.apache.aurora.api.ttypes import (
- ExecutorConfig,
- ResponseCode,
- ScheduleStatus,
-)
-
-from pystachio.config import Config
-from thrift.TSerialization import serialize
-from thrift.protocol import TJSONProtocol
+from gen.apache.aurora.api.ttypes import ExecutorConfig, ResponseCode, ScheduleStatus
def arg_type_jobkey(key):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/client/cli/options.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/cli/options.py b/src/main/python/apache/aurora/client/cli/options.py
index 65ced8c..bf86c3a 100644
--- a/src/main/python/apache/aurora/client/cli/options.py
+++ b/src/main/python/apache/aurora/client/cli/options.py
@@ -14,13 +14,13 @@
# limitations under the License.
#
+from argparse import ArgumentTypeError
from collections import namedtuple
-from apache.aurora.common.aurora_job_key import AuroraJobKey
-
from twitter.common.lang import Compatibility
from twitter.common.quantity.parse_simple import parse_time
-from argparse import ArgumentTypeError
+
+from apache.aurora.common.aurora_job_key import AuroraJobKey
class CommandOption(object):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/client/cli/quota.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/cli/quota.py b/src/main/python/apache/aurora/client/cli/quota.py
index e5dd381..5a4692d 100644
--- a/src/main/python/apache/aurora/client/cli/quota.py
+++ b/src/main/python/apache/aurora/client/cli/quota.py
@@ -16,23 +16,15 @@
from __future__ import print_function
-from apache.aurora.client.cli import (
- EXIT_INVALID_PARAMETER,
- EXIT_OK,
- Noun,
- Verb,
-)
+from thrift.protocol import TJSONProtocol
+from thrift.TSerialization import serialize
+
+from apache.aurora.client.cli import EXIT_INVALID_PARAMETER, EXIT_OK, Noun, Verb
from apache.aurora.client.cli.context import AuroraCommandContext
-from apache.aurora.client.cli.options import (
- JSON_WRITE_OPTION,
- ROLE_ARGUMENT,
-)
+from apache.aurora.client.cli.options import JSON_WRITE_OPTION, ROLE_ARGUMENT
from gen.apache.aurora.api.ttypes import ResponseCode
-from thrift.protocol import TJSONProtocol
-from thrift.TSerialization import serialize
-
class GetQuotaCmd(Verb):
@property
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/client/cli/sla.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/cli/sla.py b/src/main/python/apache/aurora/client/cli/sla.py
index 67f301a..c8cb723 100644
--- a/src/main/python/apache/aurora/client/cli/sla.py
+++ b/src/main/python/apache/aurora/client/cli/sla.py
@@ -14,11 +14,9 @@
# limitations under the License.
#
-from apache.aurora.client.cli import (
- EXIT_OK,
- Noun,
- Verb,
-)
+from twitter.common.quantity import Time
+
+from apache.aurora.client.cli import EXIT_OK, Noun, Verb
from apache.aurora.client.cli.context import AuroraCommandContext
from apache.aurora.client.cli.options import (
CommandOption,
@@ -27,8 +25,6 @@ from apache.aurora.client.cli.options import (
parse_time_values
)
-from twitter.common.quantity import Time
-
class GetTaskUpCountCmd(Verb):
@property
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/client/cli/task.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/cli/task.py b/src/main/python/apache/aurora/client/cli/task.py
index a162b86..1253ece 100644
--- a/src/main/python/apache/aurora/client/cli/task.py
+++ b/src/main/python/apache/aurora/client/cli/task.py
@@ -18,13 +18,18 @@
"""
from __future__ import print_function
-from datetime import datetime
+
import json
import os
import pprint
import subprocess
import sys
import time
+from datetime import datetime
+
+from pystachio.config import Config
+from thrift.protocol import TJSONProtocol
+from thrift.TSerialization import serialize
from apache.aurora.client.api.command_runner import DistributedCommandRunner
from apache.aurora.client.api.updater_util import UpdaterConfig
@@ -34,7 +39,7 @@ from apache.aurora.client.cli import (
EXIT_INVALID_PARAMETER,
EXIT_OK,
Noun,
- Verb,
+ Verb
)
from apache.aurora.client.cli.context import AuroraCommandContext
from apache.aurora.client.cli.options import (
@@ -51,22 +56,13 @@ from apache.aurora.client.cli.options import (
JSON_WRITE_OPTION,
SSH_USER_OPTION,
TASK_INSTANCE_ARGUMENT,
- WATCH_OPTION,
+ WATCH_OPTION
)
from apache.aurora.common.aurora_job_key import AuroraJobKey
from apache.aurora.common.clusters import CLUSTERS
from gen.apache.aurora.api.constants import ACTIVE_STATES, AURORA_EXECUTOR_NAME
-from gen.apache.aurora.api.ttypes import (
- ExecutorConfig,
- ResponseCode,
- ScheduleStatus,
-)
-
-from pystachio.config import Config
-from thrift.TSerialization import serialize
-from thrift.protocol import TJSONProtocol
-
+from gen.apache.aurora.api.ttypes import ExecutorConfig, ResponseCode, ScheduleStatus
class RunCommand(Verb):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/client/commands/admin.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/commands/admin.py b/src/main/python/apache/aurora/client/commands/admin.py
index 0c804f5..16e73ba 100644
--- a/src/main/python/apache/aurora/client/commands/admin.py
+++ b/src/main/python/apache/aurora/client/commands/admin.py
@@ -16,15 +16,16 @@
from __future__ import print_function
-"""Command-line client for managing admin-only interactions with the aurora scheduler.
-"""
-
import json
import optparse
import os
import pipes
-import sys
import subprocess
+import sys
+
+from twitter.common import app, log
+from twitter.common.quantity import Amount, Data, Time
+from twitter.common.quantity.parse_simple import parse_data, parse_time
from apache.aurora.client.api import AuroraClientAPI
from apache.aurora.client.api.sla import DomainUpTimeSlaVector
@@ -42,15 +43,14 @@ from apache.aurora.common.clusters import CLUSTERS
from apache.aurora.common.shellify import shellify
from gen.apache.aurora.api.constants import ACTIVE_STATES, TERMINAL_STATES
-from gen.apache.aurora.api.ttypes import (
- ResponseCode,
- ScheduleStatus,
- TaskQuery,
-)
+from gen.apache.aurora.api.ttypes import ResponseCode, ScheduleStatus, TaskQuery
+
+"""Command-line client for managing admin-only interactions with the aurora scheduler.
+"""
+
+
+
-from twitter.common import app, log
-from twitter.common.quantity import Amount, Data, Time
-from twitter.common.quantity.parse_simple import parse_data, parse_time
MIN_SLA_INSTANCE_COUNT = optparse.Option(
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/client/commands/core.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/commands/core.py b/src/main/python/apache/aurora/client/commands/core.py
index 0046c76..4ce6035 100644
--- a/src/main/python/apache/aurora/client/commands/core.py
+++ b/src/main/python/apache/aurora/client/commands/core.py
@@ -20,26 +20,30 @@
from __future__ import print_function
import collections
-from datetime import datetime
import json
import os
import pprint
import subprocess
import sys
import time
+from datetime import datetime
from tempfile import NamedTemporaryFile
+from twitter.common import app, log
+from twitter.common.python.pex import PexInfo
+
+from apache.aurora.client.api.disambiguator import LiveJobDisambiguator
+from apache.aurora.client.api.job_monitor import JobMonitor
+from apache.aurora.client.api.quota_check import print_quota
+from apache.aurora.client.api.updater_util import UpdaterConfig
from apache.aurora.client.base import (
check_and_log_response,
deprecation_warning,
die,
handle_open,
requires,
- synthesize_url)
-from apache.aurora.client.api.disambiguator import LiveJobDisambiguator
-from apache.aurora.client.api.job_monitor import JobMonitor
-from apache.aurora.client.api.quota_check import print_quota
-from apache.aurora.client.api.updater_util import UpdaterConfig
+ synthesize_url
+)
from apache.aurora.client.config import get_config, GlobalHookRegistry
from apache.aurora.client.factory import make_client, make_client_factory
from apache.aurora.client.options import (
@@ -56,15 +60,13 @@ from apache.aurora.client.options import (
MAX_FAILURES_OPTION,
OPEN_BROWSER_OPTION,
SHARDS_OPTION,
- WAIT_UNTIL_OPTION)
+ WAIT_UNTIL_OPTION
+)
from apache.aurora.common.aurora_job_key import AuroraJobKey
-from gen.apache.aurora.api.constants import ACTIVE_STATES, CURRENT_API_VERSION, AURORA_EXECUTOR_NAME
+from gen.apache.aurora.api.constants import ACTIVE_STATES, AURORA_EXECUTOR_NAME, CURRENT_API_VERSION
from gen.apache.aurora.api.ttypes import ExecutorConfig, ResponseCode, ScheduleStatus
-from twitter.common import app, log
-from twitter.common.python.pex import PexInfo
-
def get_job_config(job_spec, config_file, options):
try:
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/client/commands/help.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/commands/help.py b/src/main/python/apache/aurora/client/commands/help.py
index 36e548f..2038317 100644
--- a/src/main/python/apache/aurora/client/commands/help.py
+++ b/src/main/python/apache/aurora/client/commands/help.py
@@ -19,10 +19,10 @@ from __future__ import print_function
import collections
import sys
-from apache.aurora.client.base import die
-
from twitter.common import app
+from apache.aurora.client.base import die
+
def make_commands_str(commands):
commands.sort()
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/client/commands/maintenance.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/commands/maintenance.py b/src/main/python/apache/aurora/client/commands/maintenance.py
index f3c0591..68d63a1 100644
--- a/src/main/python/apache/aurora/client/commands/maintenance.py
+++ b/src/main/python/apache/aurora/client/commands/maintenance.py
@@ -14,22 +14,15 @@
# limitations under the License.
#
-import os
import optparse
+import os
import subprocess
-from apache.aurora.admin.host_maintenance import HostMaintenance
-from apache.aurora.client.base import (
- die,
- FILENAME_OPTION,
- HOSTS_OPTION,
- parse_hosts,
- requires
-)
-from apache.aurora.common.clusters import CLUSTERS
-
from twitter.common import app, log
+from apache.aurora.admin.host_maintenance import HostMaintenance
+from apache.aurora.client.base import die, FILENAME_OPTION, HOSTS_OPTION, parse_hosts, requires
+from apache.aurora.common.clusters import CLUSTERS
GROUPING_OPTION = optparse.Option(
'--grouping',
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/client/commands/run.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/commands/run.py b/src/main/python/apache/aurora/client/commands/run.py
index 332bded..909b4ef 100644
--- a/src/main/python/apache/aurora/client/commands/run.py
+++ b/src/main/python/apache/aurora/client/commands/run.py
@@ -14,16 +14,13 @@
# limitations under the License.
#
+from twitter.common import app
+
+from apache.aurora.client.api.command_runner import DistributedCommandRunner
from apache.aurora.client.base import die
-from apache.aurora.client.options import (
- EXECUTOR_SANDBOX_OPTION,
- SSH_USER_OPTION,
-)
+from apache.aurora.client.options import EXECUTOR_SANDBOX_OPTION, SSH_USER_OPTION
from apache.aurora.common.aurora_job_key import AuroraJobKey
from apache.aurora.common.clusters import CLUSTERS
-from apache.aurora.client.api.command_runner import DistributedCommandRunner
-
-from twitter.common import app
@app.command
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/client/commands/ssh.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/commands/ssh.py b/src/main/python/apache/aurora/client/commands/ssh.py
index d1499ec..3b18ef0 100644
--- a/src/main/python/apache/aurora/client/commands/ssh.py
+++ b/src/main/python/apache/aurora/client/commands/ssh.py
@@ -16,16 +16,13 @@
import subprocess
+from twitter.common import app
+
+from apache.aurora.client.api.command_runner import DistributedCommandRunner
from apache.aurora.client.base import check_and_log_response, die
from apache.aurora.client.factory import make_client
-from apache.aurora.client.options import (
- EXECUTOR_SANDBOX_OPTION,
- SSH_USER_OPTION,
-)
+from apache.aurora.client.options import EXECUTOR_SANDBOX_OPTION, SSH_USER_OPTION
from apache.aurora.common.aurora_job_key import AuroraJobKey
-from apache.aurora.client.api.command_runner import DistributedCommandRunner
-
-from twitter.common import app
@app.command
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/client/config.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/config.py b/src/main/python/apache/aurora/client/config.py
index 350d84c..ee5743e 100644
--- a/src/main/python/apache/aurora/client/config.py
+++ b/src/main/python/apache/aurora/client/config.py
@@ -25,6 +25,9 @@ import posixpath
import re
import sys
+from pystachio import Empty, Ref
+from twitter.common import app, log
+
from apache.aurora.client import binding_helper
from apache.aurora.client.base import deprecation_warning, die
from apache.aurora.config import AuroraConfig
@@ -32,9 +35,6 @@ from apache.thermos.config.schema_helpers import Tasks
from gen.apache.aurora.api.constants import DEFAULT_ENVIRONMENT
-from pystachio import Empty, Ref
-from twitter.common import app, log
-
CRON_DEPRECATION_WARNING = """
The "cron_policy" parameter to Jobs has been renamed to "cron_collision_policy".
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/client/factory.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/factory.py b/src/main/python/apache/aurora/client/factory.py
index 00c4041..d8938be 100644
--- a/src/main/python/apache/aurora/client/factory.py
+++ b/src/main/python/apache/aurora/client/factory.py
@@ -16,14 +16,14 @@
import functools
+from twitter.common import app
+
from apache.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
from apache.aurora.common.cluster import Cluster
from apache.aurora.common.clusters import CLUSTERS
from .base import die
-from twitter.common import app
-
# TODO(wickman) Kill make_client and make_client_factory as part of MESOS-3801.
# These are currently necessary indirections for the LiveJobDisambiguator among
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/client/hooks/hooked_api.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/hooks/hooked_api.py b/src/main/python/apache/aurora/client/hooks/hooked_api.py
index 3d30cbd..0568d91 100644
--- a/src/main/python/apache/aurora/client/hooks/hooked_api.py
+++ b/src/main/python/apache/aurora/client/hooks/hooked_api.py
@@ -17,14 +17,14 @@
import functools
import traceback
+from twitter.common import log
+
from apache.aurora.client.api import AuroraClientAPI
from apache.aurora.client.config import GlobalHookRegistry
from apache.aurora.common.aurora_job_key import AuroraJobKey
from gen.apache.aurora.api.ttypes import ResponseCode
-from twitter.common import log
-
def _partial(function, *args, **kw):
"""Returns a partial function __name__ inherited from parent function."""
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/client/options.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/options.py b/src/main/python/apache/aurora/client/options.py
index 2bd76aa..109ab6f 100644
--- a/src/main/python/apache/aurora/client/options.py
+++ b/src/main/python/apache/aurora/client/options.py
@@ -19,7 +19,6 @@ import optparse
from apache.aurora.common.aurora_job_key import AuroraJobKey
from apache.thermos.common.options import add_binding_to
-
__all__ = (
'BATCH_OPTION',
'CLUSTER_CONFIG_OPTION',
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/common/aurora_job_key.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/common/aurora_job_key.py b/src/main/python/apache/aurora/common/aurora_job_key.py
index 298b574..1392b9d 100644
--- a/src/main/python/apache/aurora/common/aurora_job_key.py
+++ b/src/main/python/apache/aurora/common/aurora_job_key.py
@@ -16,11 +16,11 @@
import re
+from twitter.common.lang import Compatibility, total_ordering
+
from gen.apache.aurora.api.constants import GOOD_IDENTIFIER_PATTERN_PYTHON
from gen.apache.aurora.api.ttypes import Identity, JobKey, TaskQuery
-from twitter.common.lang import Compatibility, total_ordering
-
# TODO(ksweeney): This can just probably just extend namedtuple.
@total_ordering
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/common/auth/__init__.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/common/auth/__init__.py b/src/main/python/apache/aurora/common/auth/__init__.py
index c8b8e03..34cbacb 100644
--- a/src/main/python/apache/aurora/common/auth/__init__.py
+++ b/src/main/python/apache/aurora/common/auth/__init__.py
@@ -14,5 +14,5 @@
# limitations under the License.
#
-from .auth_module_manager import make_session_key, register_auth_module, SessionKeyError
from .auth_module import AuthModule, InsecureAuthModule
+from .auth_module_manager import make_session_key, register_auth_module, SessionKeyError
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/common/auth/auth_module.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/common/auth/auth_module.py b/src/main/python/apache/aurora/common/auth/auth_module.py
index 320fb46..edd6f13 100644
--- a/src/main/python/apache/aurora/common/auth/auth_module.py
+++ b/src/main/python/apache/aurora/common/auth/auth_module.py
@@ -14,10 +14,9 @@
# limitations under the License.
#
-from abc import abstractmethod, abstractproperty
-
import getpass
import time
+from abc import abstractmethod, abstractproperty
from twitter.common.lang import Interface
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/common/auth/auth_module_manager.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/common/auth/auth_module_manager.py b/src/main/python/apache/aurora/common/auth/auth_module_manager.py
index eda5073..c40f6c5 100644
--- a/src/main/python/apache/aurora/common/auth/auth_module_manager.py
+++ b/src/main/python/apache/aurora/common/auth/auth_module_manager.py
@@ -16,10 +16,9 @@
from twitter.common import log
-from gen.apache.aurora.api.ttypes import SessionKey
-
from .auth_module import AuthModule, InsecureAuthModule
+from gen.apache.aurora.api.ttypes import SessionKey
_INSECURE_AUTH_MODULE = InsecureAuthModule()
_AUTH_MODULES = {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/common/cluster_option.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/common/cluster_option.py b/src/main/python/apache/aurora/common/cluster_option.py
index 4bc8482..50510b9 100644
--- a/src/main/python/apache/aurora/common/cluster_option.py
+++ b/src/main/python/apache/aurora/common/cluster_option.py
@@ -15,10 +15,7 @@
#
from copy import copy
-from optparse import (
- NO_DEFAULT,
- OptionValueError,
- Option)
+from optparse import NO_DEFAULT, Option, OptionValueError
def _check_mesos_cluster(option, opt, value):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/common/clusters.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/common/clusters.py b/src/main/python/apache/aurora/common/clusters.py
index 88986ee..823b16b 100644
--- a/src/main/python/apache/aurora/common/clusters.py
+++ b/src/main/python/apache/aurora/common/clusters.py
@@ -16,18 +16,17 @@
from __future__ import print_function
-from collections import Mapping, namedtuple
-from contextlib import contextmanager
import itertools
import json
import os
import sys
-
-from .cluster import Cluster
+from collections import Mapping, namedtuple
+from contextlib import contextmanager
from pystachio import Required, String
from twitter.common.collections import maybe_list
+from .cluster import Cluster
try:
import yaml
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/common/http_signaler.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/common/http_signaler.py b/src/main/python/apache/aurora/common/http_signaler.py
index e63d6f8..79a96eb 100644
--- a/src/main/python/apache/aurora/common/http_signaler.py
+++ b/src/main/python/apache/aurora/common/http_signaler.py
@@ -16,8 +16,8 @@
import contextlib
import os
-from socket import timeout as SocketTimeout
import sys
+from socket import timeout as SocketTimeout
from twitter.common import log
from twitter.common.lang import Compatibility
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/config/__init__.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/config/__init__.py b/src/main/python/apache/aurora/config/__init__.py
index 74e6b21..aad047a 100644
--- a/src/main/python/apache/aurora/config/__init__.py
+++ b/src/main/python/apache/aurora/config/__init__.py
@@ -18,6 +18,8 @@ from __future__ import absolute_import
from collections import defaultdict
+from pystachio import Empty, Environment, Ref
+
from apache.aurora.common.aurora_job_key import AuroraJobKey
from apache.aurora.config.schema.base import MesosContext
from apache.thermos.config.loader import PortExtractor, ThermosTaskWrapper
@@ -25,9 +27,8 @@ from apache.thermos.config.schema import ThermosContext
from .loader import AuroraConfigLoader
from .port_resolver import PortResolver
-from .thrift import convert as convert_thrift, InvalidConfig as InvalidThriftConfig
-
-from pystachio import Empty, Environment, Ref
+from .thrift import convert as convert_thrift
+from .thrift import InvalidConfig as InvalidThriftConfig
__all__ = ('AuroraConfig', 'PortResolver')
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/config/loader.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/config/loader.py b/src/main/python/apache/aurora/config/loader.py
index 2b600fb..7230498 100644
--- a/src/main/python/apache/aurora/config/loader.py
+++ b/src/main/python/apache/aurora/config/loader.py
@@ -18,10 +18,10 @@ import json
import pkgutil
import textwrap
-from apache.aurora.config.schema import base as base_schema
-
from pystachio.config import Config as PystachioConfig
+from apache.aurora.config.schema import base as base_schema
+
class AuroraConfigLoader(PystachioConfig):
SCHEMA_MODULES = []
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/config/recipes.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/config/recipes.py b/src/main/python/apache/aurora/config/recipes.py
index ba8c15b..cfd326c 100644
--- a/src/main/python/apache/aurora/config/recipes.py
+++ b/src/main/python/apache/aurora/config/recipes.py
@@ -16,10 +16,10 @@
import os
-from .loader import AuroraConfigLoader
-
import pkg_resources
+from .loader import AuroraConfigLoader
+
class Recipes(object):
"""
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/config/repl.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/config/repl.py b/src/main/python/apache/aurora/config/repl.py
index bfbff0d..a923d62 100644
--- a/src/main/python/apache/aurora/config/repl.py
+++ b/src/main/python/apache/aurora/config/repl.py
@@ -14,12 +14,11 @@
# limitations under the License.
#
-from apache.aurora.config.loader import AuroraConfigLoader
+import code
from twitter.common.lang import Compatibility
+from apache.aurora.config.loader import AuroraConfigLoader
-
-import code
code.interact('Mesos Config REPL',
local=Compatibility.exec_function(AuroraConfigLoader.DEFAULT_SCHEMA, globals()))
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/config/thrift.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/config/thrift.py b/src/main/python/apache/aurora/config/thrift.py
index 9a0db88..1798c40 100644
--- a/src/main/python/apache/aurora/config/thrift.py
+++ b/src/main/python/apache/aurora/config/thrift.py
@@ -17,31 +17,27 @@
import getpass
import re
-from apache.aurora.config.schema.base import (
- HealthCheckConfig,
- MesosContext,
- MesosTaskInstance,
-)
+from pystachio import Empty, Ref
+from twitter.common.lang import Compatibility
+
+from apache.aurora.config.schema.base import HealthCheckConfig, MesosContext, MesosTaskInstance
from apache.thermos.config.loader import ThermosTaskValidator
-from gen.apache.aurora.api.constants import GOOD_IDENTIFIER_PATTERN_PYTHON, AURORA_EXECUTOR_NAME
+from gen.apache.aurora.api.constants import AURORA_EXECUTOR_NAME, GOOD_IDENTIFIER_PATTERN_PYTHON
from gen.apache.aurora.api.ttypes import (
- Constraint,
- CronCollisionPolicy,
- ExecutorConfig,
- Identity,
- JobConfiguration,
- JobKey,
- LimitConstraint,
- Metadata,
- TaskConfig,
- TaskConstraint,
- ValueConstraint,
+ Constraint,
+ CronCollisionPolicy,
+ ExecutorConfig,
+ Identity,
+ JobConfiguration,
+ JobKey,
+ LimitConstraint,
+ Metadata,
+ TaskConfig,
+ TaskConstraint,
+ ValueConstraint
)
-from pystachio import Empty, Ref
-from twitter.common.lang import Compatibility
-
__all__ = (
'InvalidConfig',
'convert'
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/executor/aurora_executor.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/executor/aurora_executor.py b/src/main/python/apache/aurora/executor/aurora_executor.py
index 9dff12b..3bb9c0c 100644
--- a/src/main/python/apache/aurora/executor/aurora_executor.py
+++ b/src/main/python/apache/aurora/executor/aurora_executor.py
@@ -19,24 +19,20 @@ import threading
import time
import traceback
+import mesos_pb2 as mesos_pb
+from twitter.common import log
+from twitter.common.concurrent import deadline, defer, Timeout
+from twitter.common.metrics import Observable
+from twitter.common.quantity import Amount, Time
+
from .common.kill_manager import KillManager
from .common.sandbox import DirectorySandbox, SandboxProvider
from .common.status_checker import ChainedStatusChecker, ExitState
from .common.task_info import assigned_task_from_mesos_task
-from .common.task_runner import (
- TaskError,
- TaskRunner,
- TaskRunnerProvider,
-)
+from .common.task_runner import TaskError, TaskRunner, TaskRunnerProvider
from .executor_base import ExecutorBase
from .status_manager import StatusManager
-import mesos_pb2 as mesos_pb
-from twitter.common import log
-from twitter.common.concurrent import deadline, defer, Timeout
-from twitter.common.metrics import Observable
-from twitter.common.quantity import Amount, Time
-
class DefaultSandboxProvider(SandboxProvider):
SANDBOX_NAME = 'sandbox'
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/executor/bin/gc_executor_main.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/executor/bin/gc_executor_main.py b/src/main/python/apache/aurora/executor/bin/gc_executor_main.py
index 488828f..7ad8b6a 100644
--- a/src/main/python/apache/aurora/executor/bin/gc_executor_main.py
+++ b/src/main/python/apache/aurora/executor/bin/gc_executor_main.py
@@ -21,15 +21,15 @@ slave.
"""
-from apache.aurora.executor.executor_detector import ExecutorDetector
-from apache.aurora.executor.gc_executor import ThermosGCExecutor
-from apache.thermos.common.path import TaskPath
-
import mesos
from twitter.common import app, log
from twitter.common.log.options import LogOptions
from twitter.common.metrics.sampler import DiskMetricWriter
+from apache.aurora.executor.executor_detector import ExecutorDetector
+from apache.aurora.executor.gc_executor import ThermosGCExecutor
+from apache.thermos.common.path import TaskPath
+
app.configure(debug=True)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/executor/bin/thermos_executor_main.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/executor/bin/thermos_executor_main.py b/src/main/python/apache/aurora/executor/bin/thermos_executor_main.py
index 806dc91..86deb7d 100644
--- a/src/main/python/apache/aurora/executor/bin/thermos_executor_main.py
+++ b/src/main/python/apache/aurora/executor/bin/thermos_executor_main.py
@@ -23,15 +23,14 @@ slave.
import os
-from apache.aurora.executor.common.executor_timeout import ExecutorTimeout
-from apache.aurora.executor.common.health_checker import HealthCheckerProvider
-from apache.aurora.executor.aurora_executor import AuroraExecutor
-from apache.aurora.executor.thermos_task_runner import DefaultThermosTaskRunnerProvider
-
import mesos
from twitter.common import app, log
from twitter.common.log.options import LogOptions
+from apache.aurora.executor.aurora_executor import AuroraExecutor
+from apache.aurora.executor.common.executor_timeout import ExecutorTimeout
+from apache.aurora.executor.common.health_checker import HealthCheckerProvider
+from apache.aurora.executor.thermos_task_runner import DefaultThermosTaskRunnerProvider
app.configure(debug=True)
LogOptions.set_simple(True)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/executor/bin/thermos_runner_main.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/executor/bin/thermos_runner_main.py b/src/main/python/apache/aurora/executor/bin/thermos_runner_main.py
index 74397dc..2c05fde 100644
--- a/src/main/python/apache/aurora/executor/bin/thermos_runner_main.py
+++ b/src/main/python/apache/aurora/executor/bin/thermos_runner_main.py
@@ -14,11 +14,10 @@
# limitations under the License.
#
-from apache.aurora.executor.thermos_runner import proxy_main as runner_proxy_main
-
from twitter.common import app
from twitter.common.log.options import LogOptions
+from apache.aurora.executor.thermos_runner import proxy_main as runner_proxy_main
LogOptions.set_simple(True)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/executor/common/executor_timeout.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/executor/common/executor_timeout.py b/src/main/python/apache/aurora/executor/common/executor_timeout.py
index ef0aaa4..56a143c 100644
--- a/src/main/python/apache/aurora/executor/common/executor_timeout.py
+++ b/src/main/python/apache/aurora/executor/common/executor_timeout.py
@@ -15,8 +15,8 @@
#
from twitter.common import log
-from twitter.common.quantity import Amount, Time
from twitter.common.exceptions import ExceptionalThread
+from twitter.common.quantity import Amount, Time
class ExecutorTimeout(ExceptionalThread):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/executor/common/health_checker.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/executor/common/health_checker.py b/src/main/python/apache/aurora/executor/common/health_checker.py
index 4a1b0af..446efce 100644
--- a/src/main/python/apache/aurora/executor/common/health_checker.py
+++ b/src/main/python/apache/aurora/executor/common/health_checker.py
@@ -17,18 +17,14 @@
import threading
import time
+from twitter.common import log
+from twitter.common.exceptions import ExceptionalThread
+
from apache.aurora.common.http_signaler import HttpSignaler
-from .status_checker import (
- ExitState,
- StatusChecker,
- StatusCheckerProvider,
- StatusResult,
-)
+from .status_checker import ExitState, StatusChecker, StatusCheckerProvider, StatusResult
from .task_info import mesos_task_instance_from_assigned_task, resolve_ports
-from twitter.common import log
-from twitter.common.exceptions import ExceptionalThread
class HealthCheckerThread(StatusChecker, ExceptionalThread):
"""Generic, StatusChecker-conforming thread for arbitrary periodic health checks
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/executor/common/sandbox.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/executor/common/sandbox.py b/src/main/python/apache/aurora/executor/common/sandbox.py
index c1beb1e..ed7e81f 100644
--- a/src/main/python/apache/aurora/executor/common/sandbox.py
+++ b/src/main/python/apache/aurora/executor/common/sandbox.py
@@ -14,11 +14,11 @@
# limitations under the License.
#
-from abc import abstractmethod, abstractproperty
import getpass
import grp
import os
import pwd
+from abc import abstractmethod, abstractproperty
from twitter.common import log
from twitter.common.dirutil import safe_mkdir, safe_rmtree
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/executor/common/task_info.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/executor/common/task_info.py b/src/main/python/apache/aurora/executor/common/task_info.py
index 3284ae6..2c1cc10 100644
--- a/src/main/python/apache/aurora/executor/common/task_info.py
+++ b/src/main/python/apache/aurora/executor/common/task_info.py
@@ -16,16 +16,17 @@
import json
+from pystachio import Ref
+from thrift.Thrift import TException
+from thrift.TSerialization import deserialize as thrift_deserialize
+from twitter.common import log
+
from apache.aurora.config.port_resolver import PortResolver
from apache.aurora.config.schema.base import MesosJob, MesosTaskInstance
from apache.aurora.config.thrift import task_instance_from_job
from gen.apache.aurora.api.ttypes import AssignedTask
-from pystachio import Ref
-from thrift.Thrift import TException
-from thrift.TSerialization import deserialize as thrift_deserialize
-from twitter.common import log
def assigned_task_from_mesos_task(task):
"""Deserialize AssignedTask from a launchTask task protocol buffer."""
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/executor/executor_vars.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/executor/executor_vars.py b/src/main/python/apache/aurora/executor/executor_vars.py
index bb7755e..d6de9fd 100644
--- a/src/main/python/apache/aurora/executor/executor_vars.py
+++ b/src/main/python/apache/aurora/executor/executor_vars.py
@@ -19,11 +19,7 @@ import time
import psutil
from twitter.common.exceptions import ExceptionalThread
-from twitter.common.metrics import (
- LambdaGauge,
- MutatorGauge,
- NamedGauge,
- Observable)
+from twitter.common.metrics import LambdaGauge, MutatorGauge, NamedGauge, Observable
from twitter.common.python.pex import PexInfo
from twitter.common.quantity import Amount, Time
from twitter.common.string.scanf import ScanfParser
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/executor/gc_executor.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/executor/gc_executor.py b/src/main/python/apache/aurora/executor/gc_executor.py
index 11d234d..4c6b1af 100644
--- a/src/main/python/apache/aurora/executor/gc_executor.py
+++ b/src/main/python/apache/aurora/executor/gc_executor.py
@@ -26,25 +26,6 @@ import os
import threading
import time
-from apache.thermos.common.ckpt import CheckpointDispatcher
-from apache.thermos.common.path import TaskPath
-from apache.thermos.core.inspector import CheckpointInspector
-from apache.thermos.core.helper import TaskKiller
-from apache.thermos.monitoring.detector import TaskDetector
-from apache.thermos.monitoring.garbage import TaskGarbageCollector
-
-from gen.apache.aurora.api.constants import TERMINAL_STATES
-from gen.apache.aurora.api.ttypes import ScheduleStatus
-from gen.apache.aurora.comm.ttypes import (
- AdjustRetainedTasks,
- DeletedTasks,
- SchedulerMessage)
-from gen.apache.thermos.ttypes import TaskState
-
-from .common.sandbox import DirectorySandbox, SandboxInterface
-from .executor_base import ExecutorBase
-from .executor_detector import ExecutorDetector
-
import mesos_pb2 as mesos_pb
import psutil
from thrift.TSerialization import deserialize as thrift_deserialize
@@ -55,6 +36,21 @@ from twitter.common.metrics import Observable
from twitter.common.metrics.gauge import AtomicGauge
from twitter.common.quantity import Amount, Time
+from apache.thermos.common.ckpt import CheckpointDispatcher
+from apache.thermos.common.path import TaskPath
+from apache.thermos.core.helper import TaskKiller
+from apache.thermos.core.inspector import CheckpointInspector
+from apache.thermos.monitoring.detector import TaskDetector
+from apache.thermos.monitoring.garbage import TaskGarbageCollector
+
+from .common.sandbox import DirectorySandbox, SandboxInterface
+from .executor_base import ExecutorBase
+from .executor_detector import ExecutorDetector
+
+from gen.apache.aurora.api.constants import TERMINAL_STATES
+from gen.apache.aurora.api.ttypes import ScheduleStatus
+from gen.apache.aurora.comm.ttypes import AdjustRetainedTasks, DeletedTasks, SchedulerMessage
+from gen.apache.thermos.ttypes import TaskState
THERMOS_TO_TWITTER_STATES = {
TaskState.ACTIVE: ScheduleStatus.RUNNING,
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/executor/status_manager.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/executor/status_manager.py b/src/main/python/apache/aurora/executor/status_manager.py
index 44a896f..54b6053 100644
--- a/src/main/python/apache/aurora/executor/status_manager.py
+++ b/src/main/python/apache/aurora/executor/status_manager.py
@@ -16,12 +16,12 @@
import time
-from .common.status_checker import StatusChecker
-
from twitter.common import log
from twitter.common.exceptions import ExceptionalThread
from twitter.common.quantity import Amount, Time
+from .common.status_checker import StatusChecker
+
class StatusManager(ExceptionalThread):
"""
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/executor/thermos_runner.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/executor/thermos_runner.py b/src/main/python/apache/aurora/executor/thermos_runner.py
index 1e6634d..2521851 100644
--- a/src/main/python/apache/aurora/executor/thermos_runner.py
+++ b/src/main/python/apache/aurora/executor/thermos_runner.py
@@ -20,14 +20,13 @@ import signal
import sys
import traceback
+from twitter.common import app, log
+
from apache.thermos.common.options import add_port_to
from apache.thermos.common.planner import TaskPlanner
from apache.thermos.config.loader import ThermosConfigLoader
from apache.thermos.core.runner import TaskRunner
-from twitter.common import app, log
-
-
app.add_option(
"--thermos_json",
dest="thermos_json",
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/executor/thermos_task_runner.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/executor/thermos_task_runner.py b/src/main/python/apache/aurora/executor/thermos_task_runner.py
index cd9428a..d6a5564 100644
--- a/src/main/python/apache/aurora/executor/thermos_task_runner.py
+++ b/src/main/python/apache/aurora/executor/thermos_task_runner.py
@@ -22,29 +22,22 @@ import subprocess
import threading
import time
+from twitter.common import log
+from twitter.common.dirutil import chmod_plus_x, safe_mkdtemp
+from twitter.common.log.options import LogOptions
+from twitter.common.quantity import Amount, Time
+
from apache.aurora.common.http_signaler import HttpSignaler
from apache.thermos.common.path import TaskPath
from apache.thermos.config.loader import ThermosTaskWrapper
from apache.thermos.core import runner as core
from apache.thermos.monitoring.monitor import TaskMonitor
-from gen.apache.thermos.ttypes import TaskState
-
from .common.status_checker import ExitState, StatusResult
-from .common.task_info import (
- mesos_task_instance_from_assigned_task,
- resolve_ports,
-)
-from .common.task_runner import (
- TaskError,
- TaskRunner,
- TaskRunnerProvider,
-)
+from .common.task_info import mesos_task_instance_from_assigned_task, resolve_ports
+from .common.task_runner import TaskError, TaskRunner, TaskRunnerProvider
-from twitter.common import log
-from twitter.common.dirutil import chmod_plus_x, safe_mkdtemp
-from twitter.common.log.options import LogOptions
-from twitter.common.quantity import Amount, Time
+from gen.apache.thermos.ttypes import TaskState
class ThermosTaskRunner(TaskRunner):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/tools/java/organize_imports.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/tools/java/organize_imports.py b/src/main/python/apache/aurora/tools/java/organize_imports.py
index 932c87a..2a926d5 100644
--- a/src/main/python/apache/aurora/tools/java/organize_imports.py
+++ b/src/main/python/apache/aurora/tools/java/organize_imports.py
@@ -26,7 +26,6 @@ import re
import sys
from collections import defaultdict
-
IMPORT_RE = re.compile('import(?: static)? (.*);')
def get_group(import_statement):
matcher = IMPORT_RE.match(import_statement)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/aurora/tools/java/thrift_wrapper_codegen.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/tools/java/thrift_wrapper_codegen.py b/src/main/python/apache/aurora/tools/java/thrift_wrapper_codegen.py
index 28b9984..8665430 100644
--- a/src/main/python/apache/aurora/tools/java/thrift_wrapper_codegen.py
+++ b/src/main/python/apache/aurora/tools/java/thrift_wrapper_codegen.py
@@ -19,7 +19,6 @@ from __future__ import print_function
import os
import re
import sys
-
from optparse import OptionParser
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/thermos/bin/thermos.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/bin/thermos.py b/src/main/python/apache/thermos/bin/thermos.py
index a310802..0a80a1b 100644
--- a/src/main/python/apache/thermos/bin/thermos.py
+++ b/src/main/python/apache/thermos/bin/thermos.py
@@ -18,7 +18,6 @@
from __future__ import print_function
-from collections import namedtuple
import getpass
import os
import pprint
@@ -26,36 +25,30 @@ import pwd
import re
import sys
import time
+from collections import namedtuple
+
+from pystachio import Ref
+from pystachio.naming import frozendict
+from twitter.common import app, log
+from twitter.common.dirutil import du, tail_f
+from twitter.common.dirutil.tail import tail as tail_closed
+from twitter.common.log.options import LogOptions
+from twitter.common.quantity import Amount, Data, Time
+from twitter.common.quantity.parse_simple import parse_data, parse_time
+from twitter.common.recordio import RecordIO, ThriftRecordReader
-from apache.thermos.common.path import TaskPath
from apache.thermos.common.ckpt import CheckpointDispatcher
-from apache.thermos.common.options import add_port_to, add_binding_to
+from apache.thermos.common.options import add_binding_to, add_port_to
+from apache.thermos.common.path import TaskPath
from apache.thermos.config.loader import ThermosConfigLoader, ThermosTaskWrapper
-from apache.thermos.config.schema import (
- Process,
- Resources,
- Task)
+from apache.thermos.config.schema import Process, Resources, Task
from apache.thermos.core.helper import TaskRunnerHelper
from apache.thermos.core.runner import TaskRunner
from apache.thermos.monitoring.detector import TaskDetector
-from apache.thermos.monitoring.garbage import TaskGarbageCollector, DefaultCollector
+from apache.thermos.monitoring.garbage import DefaultCollector, TaskGarbageCollector
from apache.thermos.monitoring.monitor import TaskMonitor
-from gen.apache.thermos.ttypes import (
- ProcessState,
- RunnerCkpt,
- RunnerState,
- TaskState)
-
-from pystachio import Ref
-from pystachio.naming import frozendict
-from twitter.common import app, log
-from twitter.common.log.options import LogOptions
-from twitter.common.dirutil import du, tail_f
-from twitter.common.dirutil.tail import tail as tail_closed
-from twitter.common.quantity import Amount, Time, Data
-from twitter.common.quantity.parse_simple import parse_time, parse_data
-from twitter.common.recordio import RecordIO, ThriftRecordReader
+from gen.apache.thermos.ttypes import ProcessState, RunnerCkpt, RunnerState, TaskState
app.add_option("--root", dest="root", metavar="PATH",
default=TaskPath.DEFAULT_CHECKPOINT_ROOT,
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/thermos/bin/thermos_ckpt.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/bin/thermos_ckpt.py b/src/main/python/apache/thermos/bin/thermos_ckpt.py
index 16942c4..f63198d 100644
--- a/src/main/python/apache/thermos/bin/thermos_ckpt.py
+++ b/src/main/python/apache/thermos/bin/thermos_ckpt.py
@@ -15,17 +15,17 @@
#
import os
-import sys
import pprint
+import sys
import time
-from apache.thermos.common.ckpt import CheckpointDispatcher
-
-from gen.apache.thermos.ttypes import RunnerState, RunnerCkpt, TaskState
-
from twitter.common import app
from twitter.common.recordio import RecordIO, ThriftRecordReader
+from apache.thermos.common.ckpt import CheckpointDispatcher
+
+from gen.apache.thermos.ttypes import RunnerCkpt, RunnerState, TaskState
+
app.add_option("--checkpoint", dest = "ckpt", metavar = "CKPT",
help = "read checkpoint from CKPT")
app.add_option("--assemble", dest = "assemble", metavar = "CKPT", default=True,
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/thermos/common/ckpt.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/common/ckpt.py b/src/main/python/apache/thermos/common/ckpt.py
index ea1d6cc..74596c4 100644
--- a/src/main/python/apache/thermos/common/ckpt.py
+++ b/src/main/python/apache/thermos/common/ckpt.py
@@ -26,16 +26,17 @@ Task state machines.
import os
+from twitter.common import log
+from twitter.common.recordio import RecordIO, ThriftRecordReader
+
from gen.apache.thermos.ttypes import (
- ProcessState,
- ProcessStatus,
- RunnerCkpt,
- RunnerState,
- TaskState,
+ ProcessState,
+ ProcessStatus,
+ RunnerCkpt,
+ RunnerState,
+ TaskState
)
-from twitter.common import log
-from twitter.common.recordio import RecordIO, ThriftRecordReader
class UniversalStateHandler(object):
"""
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/thermos/common/options.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/common/options.py b/src/main/python/apache/thermos/common/options.py
index b8fc931..65f3171 100644
--- a/src/main/python/apache/thermos/common/options.py
+++ b/src/main/python/apache/thermos/common/options.py
@@ -16,6 +16,7 @@
from pystachio import Ref
+
class ParseError(Exception):
pass
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/thermos/common/planner.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/common/planner.py b/src/main/python/apache/thermos/common/planner.py
index 06919d2..9baed3d 100644
--- a/src/main/python/apache/thermos/common/planner.py
+++ b/src/main/python/apache/thermos/common/planner.py
@@ -22,11 +22,12 @@ TaskPlanner:
- a non-ephemeral process cannot depend upon an ephemeral process
"""
-from collections import defaultdict, namedtuple
import copy
-from functools import partial
import sys
import time
+from collections import defaultdict, namedtuple
+from functools import partial
+
class Planner(object):
"""
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/thermos/config/bin/config_load.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/config/bin/config_load.py b/src/main/python/apache/thermos/config/bin/config_load.py
index 0fa7695..aaac8a5 100644
--- a/src/main/python/apache/thermos/config/bin/config_load.py
+++ b/src/main/python/apache/thermos/config/bin/config_load.py
@@ -15,14 +15,14 @@
#
import copy
-import sys
import json
import pprint
-
-from apache.thermos.config.loader import ThermosConfigLoader
+import sys
from twitter.common import app
+from apache.thermos.config.loader import ThermosConfigLoader
+
def main(args):
"""
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/thermos/config/bin/config_repl.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/config/bin/config_repl.py b/src/main/python/apache/thermos/config/bin/config_repl.py
index 05f4708..fb324bb 100644
--- a/src/main/python/apache/thermos/config/bin/config_repl.py
+++ b/src/main/python/apache/thermos/config/bin/config_repl.py
@@ -14,6 +14,8 @@
# limitations under the License.
#
-from apache.thermos.config.schema import *
from code import interact
+
+from apache.thermos.config.schema import *
+
interact('Thermos Config REPL', local=locals())
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/thermos/config/loader.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/config/loader.py b/src/main/python/apache/thermos/config/loader.py
index 7fb86e1..5f633a6 100644
--- a/src/main/python/apache/thermos/config/loader.py
+++ b/src/main/python/apache/thermos/config/loader.py
@@ -20,14 +20,15 @@ import os
import re
import textwrap
-from apache.thermos.common.planner import TaskPlanner
-from apache.thermos.config.schema import Task
-
from pystachio import Ref
from pystachio.config import Config
from twitter.common.dirutil import safe_open
from twitter.common.lang import Compatibility
+from apache.thermos.common.planner import TaskPlanner
+from apache.thermos.config.schema import Task
+
+
class PortExtractor(object):
class InvalidPorts(Exception): pass
[2/3] Apply build-support/isort-run
Posted by wi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/thermos/config/schema_base.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/config/schema_base.py b/src/main/python/apache/thermos/config/schema_base.py
index e59edbd..146cbb7 100644
--- a/src/main/python/apache/thermos/config/schema_base.py
+++ b/src/main/python/apache/thermos/config/schema_base.py
@@ -14,19 +14,7 @@
# limitations under the License.
#
-from pystachio import (
- Boolean,
- Default,
- Empty,
- Float,
- Integer,
- List,
- Map,
- Required,
- String,
- Struct
-)
-
+from pystachio import Boolean, Default, Empty, Float, Integer, List, Map, Required, String, Struct
# Define constants for resources
BYTES = 1
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/thermos/config/schema_helpers.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/config/schema_helpers.py b/src/main/python/apache/thermos/config/schema_helpers.py
index b496ccf..f6a5caa 100644
--- a/src/main/python/apache/thermos/config/schema_helpers.py
+++ b/src/main/python/apache/thermos/config/schema_helpers.py
@@ -17,17 +17,10 @@
"""Helpers for composing Thermos workflows."""
import itertools
-from .schema_base import (
- Constraint,
- GB,
- Process,
- Resources,
- Task,
-)
-
from pystachio import Empty, List
from twitter.common.lang import Compatibility
+from .schema_base import Constraint, GB, Process, Resources, Task
__all__ = (
# shorthand for process ordering constraint
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/thermos/core/helper.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/core/helper.py b/src/main/python/apache/thermos/core/helper.py
index d4f473d..126e0ac 100644
--- a/src/main/python/apache/thermos/core/helper.py
+++ b/src/main/python/apache/thermos/core/helper.py
@@ -14,21 +14,11 @@
# limitations under the License.
#
-from contextlib import closing
import errno
import os
import signal
import time
-
-from apache.thermos.common.ckpt import CheckpointDispatcher
-from apache.thermos.common.path import TaskPath
-
-from gen.apache.thermos.ttypes import (
- ProcessState,
- ProcessStatus,
- RunnerCkpt,
- TaskState,
- TaskStatus)
+from contextlib import closing
import psutil
from twitter.common import log
@@ -36,6 +26,11 @@ from twitter.common.dirutil import lock_file, safe_mkdir
from twitter.common.quantity import Amount, Time
from twitter.common.recordio import ThriftRecordWriter
+from apache.thermos.common.ckpt import CheckpointDispatcher
+from apache.thermos.common.path import TaskPath
+
+from gen.apache.thermos.ttypes import ProcessState, ProcessStatus, RunnerCkpt, TaskState, TaskStatus
+
class TaskKiller(object):
"""
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/thermos/core/inspector.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/core/inspector.py b/src/main/python/apache/thermos/core/inspector.py
index d79042a..c69ce64 100644
--- a/src/main/python/apache/thermos/core/inspector.py
+++ b/src/main/python/apache/thermos/core/inspector.py
@@ -14,23 +14,19 @@
# limitations under the License.
#
+import pwd
from collections import namedtuple
from contextlib import closing
-import pwd
+
+from twitter.common import log
+from twitter.common.recordio import RecordIO, ThriftRecordReader
from apache.thermos.common.ckpt import CheckpointDispatcher
from apache.thermos.common.path import TaskPath
-from gen.apache.thermos.ttypes import (
- ProcessState,
- RunnerCkpt,
- RunnerState)
-
from .muxer import ProcessMuxer
-from twitter.common import log
-from twitter.common.recordio import RecordIO, ThriftRecordReader
-
+from gen.apache.thermos.ttypes import ProcessState, RunnerCkpt, RunnerState
CheckpointInspection = namedtuple('CheckpointInspection',
['runner_latest_update',
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/thermos/core/muxer.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/core/muxer.py b/src/main/python/apache/thermos/core/muxer.py
index 08fdbb2..0a4a677 100644
--- a/src/main/python/apache/thermos/core/muxer.py
+++ b/src/main/python/apache/thermos/core/muxer.py
@@ -14,14 +14,14 @@
# limitations under the License.
#
-import os
import errno
-
-from gen.apache.thermos.ttypes import RunnerCkpt
+import os
from twitter.common import log
from twitter.common.recordio import ThriftRecordReader
+from gen.apache.thermos.ttypes import RunnerCkpt
+
class ProcessMuxer(object):
class ProcessExists(Exception): pass
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/thermos/core/process.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/core/process.py b/src/main/python/apache/thermos/core/process.py
index 5658ebe..efd0a9e 100644
--- a/src/main/python/apache/thermos/core/process.py
+++ b/src/main/python/apache/thermos/core/process.py
@@ -22,7 +22,6 @@ commandline in a subprocess of its own.
"""
-from abc import abstractmethod
import getpass
import grp
import os
@@ -31,24 +30,16 @@ import signal
import subprocess
import sys
import time
+from abc import abstractmethod
-
-from gen.apache.thermos.ttypes import (
- ProcessState,
- ProcessStatus,
- RunnerCkpt,
-)
-
-from twitter.common.dirutil import (
- lock_file,
- safe_mkdir,
- safe_open,
-)
-from twitter.common.lang import Interface
from twitter.common import log
+from twitter.common.dirutil import lock_file, safe_mkdir, safe_open
+from twitter.common.lang import Interface
from twitter.common.quantity import Amount, Time
from twitter.common.recordio import ThriftRecordReader, ThriftRecordWriter
+from gen.apache.thermos.ttypes import ProcessState, ProcessStatus, RunnerCkpt
+
class Platform(Interface):
"""Abstract representation of a platform encapsulating system-level functions"""
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/thermos/core/runner.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/core/runner.py b/src/main/python/apache/thermos/core/runner.py
index a187618..4eb04ad 100644
--- a/src/main/python/apache/thermos/core/runner.py
+++ b/src/main/python/apache/thermos/core/runner.py
@@ -41,48 +41,50 @@ terminal state.
"""
-from contextlib import contextmanager
import errno
-from functools import partial
import os
import socket
import sys
import time
import traceback
+from contextlib import contextmanager
+from functools import partial
+
+from pystachio import Environment
+from twitter.common import log
+from twitter.common.dirutil import safe_mkdir
+from twitter.common.quantity import Amount, Time
+from twitter.common.recordio import ThriftRecordReader
from apache.thermos.common.ckpt import (
- CheckpointDispatcher,
- UniversalStateHandler,
- ProcessStateHandler,
- TaskStateHandler)
+ CheckpointDispatcher,
+ ProcessStateHandler,
+ TaskStateHandler,
+ UniversalStateHandler
+)
from apache.thermos.common.path import TaskPath
from apache.thermos.common.planner import TaskPlanner
from apache.thermos.config.loader import (
- ThermosConfigLoader,
- ThermosProcessWrapper,
- ThermosTaskWrapper,
- ThermosTaskValidator)
-from apache.thermos.config.schema import ThermosContext
-
-from gen.apache.thermos.ttypes import (
- ProcessState,
- ProcessStatus,
- RunnerCkpt,
- RunnerHeader,
- RunnerState,
- TaskState,
- TaskStatus,
+ ThermosConfigLoader,
+ ThermosProcessWrapper,
+ ThermosTaskValidator,
+ ThermosTaskWrapper
)
+from apache.thermos.config.schema import ThermosContext
from .helper import TaskRunnerHelper
from .muxer import ProcessMuxer
from .process import Process
-from pystachio import Environment
-from twitter.common import log
-from twitter.common.dirutil import safe_mkdir
-from twitter.common.quantity import Amount, Time
-from twitter.common.recordio import ThriftRecordReader
+from gen.apache.thermos.ttypes import (
+ ProcessState,
+ ProcessStatus,
+ RunnerCkpt,
+ RunnerHeader,
+ RunnerState,
+ TaskState,
+ TaskStatus
+)
# TODO(wickman) Currently this is messy because of all the private access into ._runner.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/thermos/monitoring/disk.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/monitoring/disk.py b/src/main/python/apache/thermos/monitoring/disk.py
index e03002a..b3d39fb 100644
--- a/src/main/python/apache/thermos/monitoring/disk.py
+++ b/src/main/python/apache/thermos/monitoring/disk.py
@@ -32,20 +32,20 @@ import threading
import time
from Queue import Empty, Queue
-from watchdog.observers import Observer as WatchdogObserver
-from watchdog.events import (
- FileSystemEventHandler,
- FileCreatedEvent,
- FileDeletedEvent,
- FileModifiedEvent,
- FileMovedEvent,
-)
-
from twitter.common import log
from twitter.common.dirutil import du, safe_bsize
from twitter.common.exceptions import ExceptionalThread
from twitter.common.lang import Lockable
from twitter.common.quantity import Amount, Time
+from watchdog.events import (
+ FileCreatedEvent,
+ FileDeletedEvent,
+ FileModifiedEvent,
+ FileMovedEvent,
+ FileSystemEventHandler
+)
+from watchdog.observers import Observer as WatchdogObserver
+
class DiskCollectorThread(ExceptionalThread):
""" Thread to calculate aggregate disk usage under a given path using a simple algorithm """
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/thermos/monitoring/garbage.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/monitoring/garbage.py b/src/main/python/apache/thermos/monitoring/garbage.py
index 60d159f..1bb54ca 100644
--- a/src/main/python/apache/thermos/monitoring/garbage.py
+++ b/src/main/python/apache/thermos/monitoring/garbage.py
@@ -14,21 +14,21 @@
# limitations under the License.
#
-from abc import abstractmethod
-from collections import namedtuple
import os
import sys
import time
+from abc import abstractmethod
+from collections import namedtuple
+
+from twitter.common.dirutil import safe_bsize, safe_delete, safe_rmtree
+from twitter.common.lang import Interface
+from twitter.common.quantity import Amount, Data, Time
from apache.thermos.common.ckpt import CheckpointDispatcher
from apache.thermos.common.path import TaskPath
from .detector import TaskDetector
-from twitter.common.dirutil import safe_delete, safe_rmtree, safe_bsize
-from twitter.common.lang import Interface
-from twitter.common.quantity import Amount, Data, Time
-
class TaskGarbageCollector(object):
def __init__(self, root):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/thermos/monitoring/monitor.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/monitoring/monitor.py b/src/main/python/apache/thermos/monitoring/monitor.py
index d524a1d..bcaf00d 100644
--- a/src/main/python/apache/thermos/monitoring/monitor.py
+++ b/src/main/python/apache/thermos/monitoring/monitor.py
@@ -24,23 +24,18 @@ as their corresponding Thrift structs:
"""
-import os
import copy
import errno
+import os
import threading
-from apache.thermos.common.ckpt import CheckpointDispatcher
-
-from gen.apache.thermos.ttypes import (
- ProcessState,
- RunnerCkpt,
- RunnerState,
- TaskState,
-)
-
from twitter.common import log
from twitter.common.recordio import ThriftRecordReader
+from apache.thermos.common.ckpt import CheckpointDispatcher
+
+from gen.apache.thermos.ttypes import ProcessState, RunnerCkpt, RunnerState, TaskState
+
class TaskMonitor(object):
"""
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/thermos/monitoring/process_collector_psutil.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/monitoring/process_collector_psutil.py b/src/main/python/apache/thermos/monitoring/process_collector_psutil.py
index c4530f2..5be7af6 100644
--- a/src/main/python/apache/thermos/monitoring/process_collector_psutil.py
+++ b/src/main/python/apache/thermos/monitoring/process_collector_psutil.py
@@ -19,12 +19,12 @@
from operator import attrgetter
from time import time
-from .process import ProcessSample
-
-from psutil import Process
-from psutil import NoSuchProcess, AccessDenied, Error as PsutilError
+from psutil import Error as PsutilError
+from psutil import AccessDenied, NoSuchProcess, Process
from twitter.common import log
+from .process import ProcessSample
+
def process_to_sample(process):
""" Given a psutil.Process, return a current ProcessSample """
@@ -104,4 +104,3 @@ class ProcessTreeCollector(object):
def procs(self):
""" Number of active processes in the tree """
return len(self._sampled_tree)
-
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/thermos/monitoring/resource.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/monitoring/resource.py b/src/main/python/apache/thermos/monitoring/resource.py
index 2056872..fa5a973 100644
--- a/src/main/python/apache/thermos/monitoring/resource.py
+++ b/src/main/python/apache/thermos/monitoring/resource.py
@@ -29,18 +29,13 @@ disk consumption and retaining a limited (FIFO) in-memory history of this data.
"""
+import platform
+import threading
+import time
from abc import abstractmethod
from bisect import bisect_left
from collections import namedtuple
from operator import attrgetter
-import platform
-import threading
-import time
-
-from .disk import DiskCollector
-from .monitor import TaskMonitor
-from .process import ProcessSample
-from .process_collector_psutil import ProcessTreeCollector
from twitter.common import log
from twitter.common.collections import RingBuffer
@@ -48,6 +43,11 @@ from twitter.common.concurrent import EventMuxer
from twitter.common.lang import Interface
from twitter.common.quantity import Amount, Time
+from .disk import DiskCollector
+from .monitor import TaskMonitor
+from .process import ProcessSample
+from .process_collector_psutil import ProcessTreeCollector
+
class ResourceMonitorBase(Interface):
""" Defines the interface for interacting with a ResourceMonitor """
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/thermos/observer/bin/thermos_observer.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/observer/bin/thermos_observer.py b/src/main/python/apache/thermos/observer/bin/thermos_observer.py
index 614b0bd..27b22d4 100644
--- a/src/main/python/apache/thermos/observer/bin/thermos_observer.py
+++ b/src/main/python/apache/thermos/observer/bin/thermos_observer.py
@@ -20,15 +20,14 @@ import socket
import sys
import time
-from apache.thermos.common.path import TaskPath
-from apache.thermos.observer.task_observer import TaskObserver
-from apache.thermos.observer.http.http_observer import BottleObserver
-
from twitter.common import app
from twitter.common.exceptions import ExceptionalThread
from twitter.common.http import HttpServer
from twitter.common.http.diagnostics import DiagnosticsEndpoints
+from apache.thermos.common.path import TaskPath
+from apache.thermos.observer.http.http_observer import BottleObserver
+from apache.thermos.observer.task_observer import TaskObserver
app.add_option("--root",
dest="root",
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/thermos/observer/http/file_browser.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/observer/http/file_browser.py b/src/main/python/apache/thermos/observer/http/file_browser.py
index 75d5ff8..4a7ddaf 100644
--- a/src/main/python/apache/thermos/observer/http/file_browser.py
+++ b/src/main/python/apache/thermos/observer/http/file_browser.py
@@ -18,13 +18,12 @@ import os
import pprint
from xml.sax.saxutils import escape
-from .templating import HttpTemplate
-
import bottle
from mako.template import Template
from twitter.common import log
from twitter.common.http import HttpServer
+from .templating import HttpTemplate
MB = 1024 * 1024
DEFAULT_CHUNK_LENGTH = MB
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/thermos/observer/http/http_observer.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/observer/http/http_observer.py b/src/main/python/apache/thermos/observer/http/http_observer.py
index caceabc..be91005 100644
--- a/src/main/python/apache/thermos/observer/http/http_observer.py
+++ b/src/main/python/apache/thermos/observer/http/http_observer.py
@@ -24,14 +24,14 @@ system. To do this, it relies heavily on the Thermos TaskObserver.
import os
import socket
+from twitter.common import log
+from twitter.common.http import HttpServer
+
from .file_browser import TaskObserverFileBrowser
from .json import TaskObserverJSONBindings
from .static_assets import StaticAssets
from .templating import HttpTemplate
-from twitter.common import log
-from twitter.common.http import HttpServer
-
class BottleObserver(HttpServer, StaticAssets, TaskObserverFileBrowser, TaskObserverJSONBindings):
"""
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/thermos/observer/http/json.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/observer/http/json.py b/src/main/python/apache/thermos/observer/http/json.py
index 66401b1..e7f47ca 100644
--- a/src/main/python/apache/thermos/observer/http/json.py
+++ b/src/main/python/apache/thermos/observer/http/json.py
@@ -69,4 +69,3 @@ class TaskObserverJSONBindings(object):
if task_ids:
task_ids = urllib.unquote(task_ids).split(',')
return self._observer.processes(task_ids)
-
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/thermos/observer/http/static_assets.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/observer/http/static_assets.py b/src/main/python/apache/thermos/observer/http/static_assets.py
index 22e5247..c29f2cd 100644
--- a/src/main/python/apache/thermos/observer/http/static_assets.py
+++ b/src/main/python/apache/thermos/observer/http/static_assets.py
@@ -17,8 +17,8 @@
import mimetypes
import os
-from bottle import HTTPResponse
import pkg_resources
+from bottle import HTTPResponse
from twitter.common import log
from twitter.common.http.server import HttpServer
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/thermos/observer/http/templating.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/observer/http/templating.py b/src/main/python/apache/thermos/observer/http/templating.py
index fd14650..ede30f2 100644
--- a/src/main/python/apache/thermos/observer/http/templating.py
+++ b/src/main/python/apache/thermos/observer/http/templating.py
@@ -15,6 +15,7 @@
#
import os
+
import pkg_resources
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/thermos/observer/observed_task.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/observer/observed_task.py b/src/main/python/apache/thermos/observer/observed_task.py
index 18a2a5a..2c8d503 100644
--- a/src/main/python/apache/thermos/observer/observed_task.py
+++ b/src/main/python/apache/thermos/observer/observed_task.py
@@ -14,17 +14,17 @@
# limitations under the License.
#
-from abc import abstractproperty
import os
-
-from apache.thermos.config.loader import ThermosTaskWrapper
-from apache.thermos.config.schema import ThermosContext
-from apache.thermos.common.ckpt import CheckpointDispatcher
+from abc import abstractproperty
from pystachio import Environment
from twitter.common import log
from twitter.common.lang import AbstractClass
+from apache.thermos.common.ckpt import CheckpointDispatcher
+from apache.thermos.config.loader import ThermosTaskWrapper
+from apache.thermos.config.schema import ThermosContext
+
class ObservedTask(AbstractClass):
""" Represents a Task being observed """
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/thermos/observer/task_observer.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/observer/task_observer.py b/src/main/python/apache/thermos/observer/task_observer.py
index 8feaa40..a064be4 100644
--- a/src/main/python/apache/thermos/observer/task_observer.py
+++ b/src/main/python/apache/thermos/observer/task_observer.py
@@ -21,10 +21,15 @@ finished Thermos tasks on a system. The primary entry point is the TaskObserver,
polls a designated Thermos checkpoint root and collates information about all tasks it discovers.
"""
-from operator import attrgetter
import os
import threading
import time
+from operator import attrgetter
+
+from twitter.common import log
+from twitter.common.exceptions import ExceptionalThread
+from twitter.common.lang import Lockable
+from twitter.common.quantity import Amount, Time
from apache.thermos.common.path import TaskPath
from apache.thermos.monitoring.detector import TaskDetector
@@ -32,14 +37,9 @@ from apache.thermos.monitoring.monitor import TaskMonitor
from apache.thermos.monitoring.process import ProcessSample
from apache.thermos.monitoring.resource import ResourceMonitorBase, TaskResourceMonitor
-from gen.apache.thermos.ttypes import ProcessState, TaskState
-
from .observed_task import ActiveObservedTask, FinishedObservedTask
-from twitter.common import log
-from twitter.common.exceptions import ExceptionalThread
-from twitter.common.lang import Lockable
-from twitter.common.quantity import Amount, Time
+from gen.apache.thermos.ttypes import ProcessState, TaskState
class TaskObserver(ExceptionalThread, Lockable):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/main/python/apache/thermos/testing/runner.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/testing/runner.py b/src/main/python/apache/thermos/testing/runner.py
index 291fdb0..8780ef6 100644
--- a/src/main/python/apache/thermos/testing/runner.py
+++ b/src/main/python/apache/thermos/testing/runner.py
@@ -25,19 +25,15 @@ import sys
import tempfile
import time
-from apache.thermos.common.path import TaskPath
+from thrift.TSerialization import deserialize as thrift_deserialize
+from twitter.common import log
+from twitter.common.contextutil import environment_as, temporary_file
+
from apache.thermos.common.ckpt import CheckpointDispatcher
+from apache.thermos.common.path import TaskPath
from apache.thermos.config.loader import ThermosTaskWrapper
-from gen.apache.thermos.ttypes import (
- TaskState,
- RunnerCkpt,
- RunnerState,
-)
-
-from thrift.TSerialization import deserialize as thrift_deserialize
-from twitter.common import log
-from twitter.common.contextutil import temporary_file, environment_as
+from gen.apache.thermos.ttypes import RunnerCkpt, RunnerState, TaskState
class Runner(object):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/admin/test_host_maintenance.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/admin/test_host_maintenance.py b/src/test/python/apache/aurora/admin/test_host_maintenance.py
index 0ba3262..18bf622 100644
--- a/src/test/python/apache/aurora/admin/test_host_maintenance.py
+++ b/src/test/python/apache/aurora/admin/test_host_maintenance.py
@@ -16,18 +16,13 @@
import unittest
-from apache.aurora.admin.host_maintenance import HostMaintenance
-from apache.aurora.common.cluster import Cluster
-
-from gen.apache.aurora.api.ttypes import (
- Hosts,
- Response,
- ResponseCode,
-)
-
import mock
import pytest
+from apache.aurora.admin.host_maintenance import HostMaintenance
+from apache.aurora.common.cluster import Cluster
+
+from gen.apache.aurora.api.ttypes import Hosts, Response, ResponseCode
DEFAULT_CLUSTER = Cluster(
name='us-west',
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/client/api/test_disambiguator.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/api/test_disambiguator.py b/src/test/python/apache/aurora/client/api/test_disambiguator.py
index 8f989ef..e9fe47a 100644
--- a/src/test/python/apache/aurora/client/api/test_disambiguator.py
+++ b/src/test/python/apache/aurora/client/api/test_disambiguator.py
@@ -16,23 +16,16 @@
import functools
+import mox
+import pytest
+
from apache.aurora.client.api import AuroraClientAPI
from apache.aurora.client.api.disambiguator import LiveJobDisambiguator
from apache.aurora.common.aurora_job_key import AuroraJobKey
from apache.aurora.common.cluster import Cluster
from gen.apache.aurora.api.constants import ResponseCode
-from gen.apache.aurora.api.ttypes import (
- Response,
- Result,
- GetJobsResult,
- JobConfiguration,
- JobKey,
-)
-
-import mox
-import pytest
-
+from gen.apache.aurora.api.ttypes import GetJobsResult, JobConfiguration, JobKey, Response, Result
TEST_CLUSTER = Cluster(name = 'smf1')
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/client/api/test_health_check.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/api/test_health_check.py b/src/test/python/apache/aurora/client/api/test_health_check.py
index 946b905..15bd75c 100644
--- a/src/test/python/apache/aurora/client/api/test_health_check.py
+++ b/src/test/python/apache/aurora/client/api/test_health_check.py
@@ -16,6 +16,9 @@
import unittest
+import mox
+import pytest
+
from apache.aurora.client.api.health_check import (
HealthCheck,
NotRetriable,
@@ -23,16 +26,7 @@ from apache.aurora.client.api.health_check import (
StatusHealthCheck
)
-from gen.apache.aurora.api.ttypes import (
- AssignedTask,
- ScheduledTask,
- ScheduleStatus,
- TaskConfig
-)
-
-import mox
-import pytest
-
+from gen.apache.aurora.api.ttypes import AssignedTask, ScheduledTask, ScheduleStatus, TaskConfig
PENDING = ScheduleStatus.PENDING
RUNNING = ScheduleStatus.RUNNING
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/client/api/test_instance_watcher.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/api/test_instance_watcher.py b/src/test/python/apache/aurora/client/api/test_instance_watcher.py
index 18c9a87..09dda3b 100644
--- a/src/test/python/apache/aurora/client/api/test_instance_watcher.py
+++ b/src/test/python/apache/aurora/client/api/test_instance_watcher.py
@@ -14,16 +14,16 @@
# limitations under the License.
#
-from math import ceil
import unittest
+from math import ceil
+
+import mox
from apache.aurora.client.api.health_check import HealthCheck
from apache.aurora.client.api.instance_watcher import InstanceWatcher
-from gen.apache.aurora.api.ttypes import *
from gen.apache.aurora.api.AuroraSchedulerManager import Client as scheduler_client
-
-import mox
+from gen.apache.aurora.api.ttypes import *
class FakeClock(object):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/client/api/test_job_monitor.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/api/test_job_monitor.py b/src/test/python/apache/aurora/client/api/test_job_monitor.py
index bfb7fed..3df0420 100644
--- a/src/test/python/apache/aurora/client/api/test_job_monitor.py
+++ b/src/test/python/apache/aurora/client/api/test_job_monitor.py
@@ -15,6 +15,12 @@
#
import unittest
+from mock import Mock
+
+from apache.aurora.client.api import AuroraClientAPI
+from apache.aurora.client.api.job_monitor import JobMonitor
+from apache.aurora.common.aurora_job_key import AuroraJobKey
+
from gen.apache.aurora.api.AuroraSchedulerManager import Client
from gen.apache.aurora.api.ttypes import (
AssignedTask,
@@ -22,17 +28,12 @@ from gen.apache.aurora.api.ttypes import (
Response,
ResponseCode,
Result,
+ ScheduledTask,
ScheduleStatus,
ScheduleStatusResult,
- ScheduledTask,
TaskEvent,
- TaskQuery,
+ TaskQuery
)
-from apache.aurora.client.api import AuroraClientAPI
-from apache.aurora.client.api.job_monitor import JobMonitor
-from apache.aurora.common.aurora_job_key import AuroraJobKey
-
-from mock import Mock
class FakeClock(object):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/client/api/test_quota_check.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/api/test_quota_check.py b/src/test/python/apache/aurora/client/api/test_quota_check.py
index 229f9a5..854a98c 100644
--- a/src/test/python/apache/aurora/client/api/test_quota_check.py
+++ b/src/test/python/apache/aurora/client/api/test_quota_check.py
@@ -15,9 +15,10 @@
#
import unittest
-
from copy import deepcopy
+from mock import Mock
+
from apache.aurora.client.api.quota_check import CapacityRequest, QuotaCheck
from gen.apache.aurora.api.AuroraSchedulerManager import Client as scheduler_client
@@ -27,9 +28,8 @@ from gen.apache.aurora.api.ttypes import (
ResourceAggregate,
Response,
ResponseCode,
- Result)
-
-from mock import Mock
+ Result
+)
class QuotaCheckTest(unittest.TestCase):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/client/api/test_restarter.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/api/test_restarter.py b/src/test/python/apache/aurora/client/api/test_restarter.py
index b0e092b..8079945 100644
--- a/src/test/python/apache/aurora/client/api/test_restarter.py
+++ b/src/test/python/apache/aurora/client/api/test_restarter.py
@@ -14,18 +14,18 @@
# limitations under the License.
#
-from apache.aurora.client.api.restarter import Restarter
+from mox import IgnoreArg, MoxTestBase
+
from apache.aurora.client.api.instance_watcher import InstanceWatcher
+from apache.aurora.client.api.restarter import Restarter
from apache.aurora.client.api.updater_util import UpdaterConfig
+from apache.aurora.client.fake_scheduler_proxy import FakeSchedulerProxy
from apache.aurora.common.aurora_job_key import AuroraJobKey
from gen.apache.aurora.api.AuroraSchedulerManager import Client as scheduler_client
from gen.apache.aurora.api.ttypes import *
-from mox import IgnoreArg, MoxTestBase
-
# test space
-from apache.aurora.client.fake_scheduler_proxy import FakeSchedulerProxy
SESSION_KEY = 'test_session'
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/client/api/test_scheduler_client.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/api/test_scheduler_client.py b/src/test/python/apache/aurora/client/api/test_scheduler_client.py
index 2736d67..399d4c6 100644
--- a/src/test/python/apache/aurora/client/api/test_scheduler_client.py
+++ b/src/test/python/apache/aurora/client/api/test_scheduler_client.py
@@ -17,20 +17,19 @@
import inspect
import unittest
-from apache.aurora.common.cluster import Cluster
-import apache.aurora.client.api.scheduler_client as scheduler_client
+from mox import IgnoreArg, IsA, Mox
from twitter.common.quantity import Amount, Time
from twitter.common.zookeeper.kazoo_client import TwitterKazooClient
from twitter.common.zookeeper.serverset.endpoint import ServiceInstance
+import apache.aurora.client.api.scheduler_client as scheduler_client
+from apache.aurora.common.cluster import Cluster
+
import gen.apache.aurora.api.AuroraAdmin as AuroraAdmin
import gen.apache.aurora.api.AuroraSchedulerManager as AuroraSchedulerManager
-from gen.apache.aurora.api.constants import DEFAULT_ENVIRONMENT, CURRENT_API_VERSION
+from gen.apache.aurora.api.constants import CURRENT_API_VERSION, DEFAULT_ENVIRONMENT
from gen.apache.aurora.api.ttypes import *
-from mox import IgnoreArg, IsA, Mox
-
-
ROLE = 'foorole'
JOB_NAME = 'barjobname'
JOB_KEY = JobKey(role=ROLE, environment=DEFAULT_ENVIRONMENT, name=JOB_NAME)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/client/api/test_sla.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/api/test_sla.py b/src/test/python/apache/aurora/client/api/test_sla.py
index 17bd72b..86b6775 100644
--- a/src/test/python/apache/aurora/client/api/test_sla.py
+++ b/src/test/python/apache/aurora/client/api/test_sla.py
@@ -17,12 +17,9 @@
import time
import unittest
-from apache.aurora.client.api.sla import (
- DomainUpTimeSlaVector,
- JobUpTimeSlaVector,
- Sla,
- task_query
-)
+from mock import call, Mock, patch
+
+from apache.aurora.client.api.sla import DomainUpTimeSlaVector, JobUpTimeSlaVector, Sla, task_query
from apache.aurora.common.aurora_job_key import AuroraJobKey
from apache.aurora.common.cluster import Cluster
@@ -34,16 +31,14 @@ from gen.apache.aurora.api.ttypes import (
Response,
ResponseCode,
Result,
+ ScheduledTask,
ScheduleStatus,
ScheduleStatusResult,
- ScheduledTask,
TaskConfig,
TaskEvent,
TaskQuery
)
-from mock import call, Mock, patch
-
class SlaTest(unittest.TestCase):
def setUp(self):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/client/api/test_updater.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/api/test_updater.py b/src/test/python/apache/aurora/client/api/test_updater.py
index 4c931d5..03a1418 100644
--- a/src/test/python/apache/aurora/client/api/test_updater.py
+++ b/src/test/python/apache/aurora/client/api/test_updater.py
@@ -18,6 +18,9 @@ from copy import deepcopy
from os import environ
from unittest import TestCase
+from mox import MockObject, Replay, Verify
+from pytest import raises
+
from apache.aurora.client.api.instance_watcher import InstanceWatcher
from apache.aurora.client.api.job_monitor import JobMonitor
from apache.aurora.client.api.quota_check import CapacityRequest, QuotaCheck
@@ -28,35 +31,32 @@ from apache.aurora.common.aurora_job_key import AuroraJobKey
from gen.apache.aurora.api.AuroraSchedulerManager import Client as scheduler_client
from gen.apache.aurora.api.constants import ACTIVE_STATES
from gen.apache.aurora.api.ttypes import (
- AddInstancesConfig,
- AcquireLockResult,
- AssignedTask,
- Constraint,
- ExecutorConfig,
- JobConfiguration,
- JobKey,
- Identity,
- LimitConstraint,
- Lock,
- LockKey,
- LockValidation,
- Metadata,
- PopulateJobResult,
- ResourceAggregate,
- Response,
- ResponseCode,
- Result,
- ScheduleStatusResult,
- ScheduledTask,
- TaskConfig,
- TaskConstraint,
- TaskQuery,
- ValueConstraint,
+ AcquireLockResult,
+ AddInstancesConfig,
+ AssignedTask,
+ Constraint,
+ ExecutorConfig,
+ Identity,
+ JobConfiguration,
+ JobKey,
+ LimitConstraint,
+ Lock,
+ LockKey,
+ LockValidation,
+ Metadata,
+ PopulateJobResult,
+ ResourceAggregate,
+ Response,
+ ResponseCode,
+ Result,
+ ScheduledTask,
+ ScheduleStatusResult,
+ TaskConfig,
+ TaskConstraint,
+ TaskQuery,
+ ValueConstraint
)
-from mox import MockObject, Replay, Verify
-from pytest import raises
-
# Debug output helper -> enables log.* in source.
if 'UPDATER_DEBUG' in environ:
from twitter.common import log
@@ -827,4 +827,3 @@ class UpdaterTest(TestCase):
self.update_and_expect_response(ResponseCode.ERROR)
self.verify_mocks()
-
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/client/cli/test_bridge.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/cli/test_bridge.py b/src/test/python/apache/aurora/client/cli/test_bridge.py
index 094bc1c..70084c3 100644
--- a/src/test/python/apache/aurora/client/cli/test_bridge.py
+++ b/src/test/python/apache/aurora/client/cli/test_bridge.py
@@ -85,4 +85,3 @@ class TestBridgedCommandLine(unittest.TestCase):
bridge2 = Bridge([self.two, self.one, self.three])
assert bridge1.execute(['test', 'three']) == 1
assert bridge2.execute(['test', 'three']) == 2
-
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/client/cli/test_cancel_update.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/cli/test_cancel_update.py b/src/test/python/apache/aurora/client/cli/test_cancel_update.py
index f27781c..6fa26dd 100644
--- a/src/test/python/apache/aurora/client/cli/test_cancel_update.py
+++ b/src/test/python/apache/aurora/client/cli/test_cancel_update.py
@@ -16,21 +16,21 @@
import contextlib
+from mock import Mock, patch
+from twitter.common.contextutil import temporary_file
+
from apache.aurora.client.cli.client import AuroraCommandLine
from apache.aurora.client.cli.util import AuroraClientCommandTest, FakeAuroraCommandContext
from apache.aurora.common.aurora_job_key import AuroraJobKey
-from twitter.common.contextutil import temporary_file
from gen.apache.aurora.api.ttypes import (
Identity,
JobKey,
ScheduleStatus,
ScheduleStatusResult,
- TaskQuery,
+ TaskQuery
)
-from mock import Mock, patch
-
class TestClientCancelUpdateCommand(AuroraClientCommandTest):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/client/cli/test_command_hooks.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/cli/test_command_hooks.py b/src/test/python/apache/aurora/client/cli/test_command_hooks.py
index 8835d82..7bdf367 100644
--- a/src/test/python/apache/aurora/client/cli/test_command_hooks.py
+++ b/src/test/python/apache/aurora/client/cli/test_command_hooks.py
@@ -16,6 +16,15 @@
import contextlib
+from mock import Mock, patch
+from twitter.common.contextutil import temporary_file
+
+from apache.aurora.client.cli import EXIT_PERMISSION_VIOLATION
+from apache.aurora.client.cli.client import AuroraCommandLine
+from apache.aurora.client.cli.command_hooks import CommandHook, GlobalCommandHookRegistry
+from apache.aurora.client.cli.util import AuroraClientCommandTest, FakeAuroraCommandContext
+from apache.aurora.config import AuroraConfig
+
from gen.apache.aurora.api.ttypes import (
AssignedTask,
Identity,
@@ -23,18 +32,9 @@ from gen.apache.aurora.api.ttypes import (
ScheduleStatus,
ScheduleStatusResult,
TaskEvent,
- TaskQuery,
+ TaskQuery
)
-from apache.aurora.client.cli import EXIT_PERMISSION_VIOLATION
-from apache.aurora.client.cli.client import AuroraCommandLine
-from apache.aurora.client.cli.command_hooks import CommandHook, GlobalCommandHookRegistry
-from apache.aurora.client.cli.util import AuroraClientCommandTest, FakeAuroraCommandContext
-from apache.aurora.config import AuroraConfig
-
-from mock import Mock, patch
-from twitter.common.contextutil import temporary_file
-
class HookForTesting(CommandHook):
def __init__(self, succeed):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/client/cli/test_create.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/cli/test_create.py b/src/test/python/apache/aurora/client/cli/test_create.py
index 96dc592..ba1d1fb 100644
--- a/src/test/python/apache/aurora/client/cli/test_create.py
+++ b/src/test/python/apache/aurora/client/cli/test_create.py
@@ -16,8 +16,15 @@
import contextlib
+from mock import Mock, patch
from twitter.common.contextutil import temporary_file
+from apache.aurora.client.cli import EXIT_COMMAND_FAILURE, EXIT_INVALID_CONFIGURATION
+from apache.aurora.client.cli.client import AuroraCommandLine
+from apache.aurora.client.cli.util import AuroraClientCommandTest, FakeAuroraCommandContext
+from apache.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
+from apache.aurora.config import AuroraConfig
+
from gen.apache.aurora.api.ttypes import (
AssignedTask,
Identity,
@@ -25,19 +32,9 @@ from gen.apache.aurora.api.ttypes import (
ScheduleStatus,
ScheduleStatusResult,
TaskEvent,
- TaskQuery,
+ TaskQuery
)
-from apache.aurora.client.cli import (
- EXIT_COMMAND_FAILURE,
- EXIT_INVALID_CONFIGURATION
-)
-from apache.aurora.client.cli.client import AuroraCommandLine
-from apache.aurora.client.cli.util import AuroraClientCommandTest, FakeAuroraCommandContext
-from apache.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
-from apache.aurora.config import AuroraConfig
-from mock import Mock, patch
-
class TestClientCreateCommand(AuroraClientCommandTest):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/client/cli/test_diff.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/cli/test_diff.py b/src/test/python/apache/aurora/client/cli/test_diff.py
index f0a9e93..00a7f0b 100644
--- a/src/test/python/apache/aurora/client/cli/test_diff.py
+++ b/src/test/python/apache/aurora/client/cli/test_diff.py
@@ -17,10 +17,10 @@
import contextlib
import os
-from apache.aurora.client.cli import (
- EXIT_INVALID_CONFIGURATION,
- EXIT_INVALID_PARAMETER
-)
+from mock import Mock, patch
+from twitter.common.contextutil import temporary_file
+
+from apache.aurora.client.cli import EXIT_INVALID_CONFIGURATION, EXIT_INVALID_PARAMETER
from apache.aurora.client.cli.client import AuroraCommandLine
from apache.aurora.client.cli.util import AuroraClientCommandTest
@@ -37,12 +37,9 @@ from gen.apache.aurora.api.ttypes import (
ScheduleStatusResult,
TaskConfig,
TaskEvent,
- TaskQuery,
+ TaskQuery
)
-from mock import Mock, patch
-from twitter.common.contextutil import temporary_file
-
class TestDiffCommand(AuroraClientCommandTest):
@classmethod
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/client/cli/test_help.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/cli/test_help.py b/src/test/python/apache/aurora/client/cli/test_help.py
index 12d8671..bd8e2e1 100644
--- a/src/test/python/apache/aurora/client/cli/test_help.py
+++ b/src/test/python/apache/aurora/client/cli/test_help.py
@@ -17,11 +17,11 @@
import contextlib
import unittest
+from mock import patch
+
from apache.aurora.client.cli import EXIT_INVALID_PARAMETER, EXIT_OK
from apache.aurora.client.cli.client import AuroraCommandLine
-from mock import patch
-
class TestHelp(unittest.TestCase):
"""Tests of the help command for the Aurora v2 client framework"""
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/client/cli/test_kill.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/cli/test_kill.py b/src/test/python/apache/aurora/client/cli/test_kill.py
index 4f62c46..3c8e72d 100644
--- a/src/test/python/apache/aurora/client/cli/test_kill.py
+++ b/src/test/python/apache/aurora/client/cli/test_kill.py
@@ -17,6 +17,7 @@
import contextlib
import unittest
+from mock import Mock, patch
from twitter.common.contextutil import temporary_file
from apache.aurora.client.cli import EXIT_TIMEOUT
@@ -25,20 +26,17 @@ from apache.aurora.client.cli.options import parse_instances
from apache.aurora.client.cli.util import AuroraClientCommandTest, FakeAuroraCommandContext
from apache.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
from apache.aurora.common.aurora_job_key import AuroraJobKey
-from twitter.common.contextutil import temporary_file
from gen.apache.aurora.api.ttypes import (
AssignedTask,
Identity,
+ ScheduledTask,
ScheduleStatus,
ScheduleStatusResult,
- ScheduledTask,
TaskEvent,
- TaskQuery,
+ TaskQuery
)
-from mock import Mock, patch
-
class TestInstancesParser(unittest.TestCase):
def test_parse_instances(self):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/client/cli/test_logging.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/cli/test_logging.py b/src/test/python/apache/aurora/client/cli/test_logging.py
index 6051ba9..d236626 100644
--- a/src/test/python/apache/aurora/client/cli/test_logging.py
+++ b/src/test/python/apache/aurora/client/cli/test_logging.py
@@ -17,8 +17,13 @@
import logging
from logging import Handler
+from mock import Mock, patch
from twitter.common.contextutil import temporary_file
+from apache.aurora.client.cli.client import AuroraCommandLine
+from apache.aurora.client.cli.util import AuroraClientCommandTest, FakeAuroraCommandContext
+from apache.aurora.config import AuroraConfig
+
from gen.apache.aurora.api.ttypes import (
AssignedTask,
Identity,
@@ -26,14 +31,9 @@ from gen.apache.aurora.api.ttypes import (
ScheduleStatus,
ScheduleStatusResult,
TaskEvent,
- TaskQuery,
+ TaskQuery
)
-from apache.aurora.client.cli.client import AuroraCommandLine
-from apache.aurora.client.cli.util import AuroraClientCommandTest, FakeAuroraCommandContext
-from apache.aurora.config import AuroraConfig
-from mock import Mock, patch
-
class MockHandler(Handler):
def __init__(self):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/client/cli/test_open.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/cli/test_open.py b/src/test/python/apache/aurora/client/cli/test_open.py
index ef816ad..601d5d7 100644
--- a/src/test/python/apache/aurora/client/cli/test_open.py
+++ b/src/test/python/apache/aurora/client/cli/test_open.py
@@ -16,10 +16,12 @@
import contextlib
-from apache.aurora.client.cli import EXIT_OK, EXIT_INVALID_PARAMETER
+from mock import Mock, patch
+
+from apache.aurora.client.cli import EXIT_INVALID_PARAMETER, EXIT_OK
from apache.aurora.client.cli.client import AuroraCommandLine
from apache.aurora.client.cli.util import AuroraClientCommandTest, FakeAuroraCommandContext
-from mock import Mock, patch
+
class TestClientOpenCommand(AuroraClientCommandTest):
@@ -61,5 +63,3 @@ class TestClientOpenCommand(AuroraClientCommandTest):
cmd = AuroraCommandLine()
self.assertRaises(SystemExit, cmd.execute, (['job', 'open']))
assert mock_context.showed_urls == []
-
-
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/client/cli/test_plugins.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/cli/test_plugins.py b/src/test/python/apache/aurora/client/cli/test_plugins.py
index 21c4400..95edbe3 100644
--- a/src/test/python/apache/aurora/client/cli/test_plugins.py
+++ b/src/test/python/apache/aurora/client/cli/test_plugins.py
@@ -16,30 +16,30 @@
import contextlib
+from mock import Mock, patch
from twitter.common.contextutil import temporary_file
-from gen.apache.aurora.api.ttypes import (
- AssignedTask,
- Identity,
- ScheduledTask,
- ScheduleStatus,
- ScheduleStatusResult,
- TaskEvent,
- TaskQuery,
-)
-
from apache.aurora.client.cli import (
ConfigurationPlugin,
EXIT_COMMAND_FAILURE,
EXIT_INVALID_CONFIGURATION,
- EXIT_OK,
+ EXIT_OK
)
from apache.aurora.client.cli.client import AuroraCommandLine
from apache.aurora.client.cli.options import CommandOption
from apache.aurora.client.cli.util import AuroraClientCommandTest, FakeAuroraCommandContext
from apache.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
from apache.aurora.config import AuroraConfig
-from mock import Mock, patch
+
+from gen.apache.aurora.api.ttypes import (
+ AssignedTask,
+ Identity,
+ ScheduledTask,
+ ScheduleStatus,
+ ScheduleStatusResult,
+ TaskEvent,
+ TaskQuery
+)
class BogusPlugin(ConfigurationPlugin):
@@ -202,4 +202,3 @@ class TestPlugins(AuroraClientCommandTest):
assert not any('list' in t for t in self.transcript)
assert "Options:" in self.transcript
assert any('bogosity' in t for t in self.transcript)
-
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/client/cli/test_quota.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/cli/test_quota.py b/src/test/python/apache/aurora/client/cli/test_quota.py
index 44908d2..9172f13 100644
--- a/src/test/python/apache/aurora/client/cli/test_quota.py
+++ b/src/test/python/apache/aurora/client/cli/test_quota.py
@@ -17,15 +17,12 @@
import contextlib
import json
+from mock import patch
+
from apache.aurora.client.cli.client import AuroraCommandLine
from apache.aurora.client.cli.util import AuroraClientCommandTest, FakeAuroraCommandContext
-from gen.apache.aurora.api.ttypes import (
- GetQuotaResult,
- ResourceAggregate,
- )
-
-from mock import patch
+from gen.apache.aurora.api.ttypes import GetQuotaResult, ResourceAggregate
class TestGetQuotaCommand(AuroraClientCommandTest):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/client/cli/test_restart.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/cli/test_restart.py b/src/test/python/apache/aurora/client/cli/test_restart.py
index 7749580..d365ef4 100644
--- a/src/test/python/apache/aurora/client/cli/test_restart.py
+++ b/src/test/python/apache/aurora/client/cli/test_restart.py
@@ -16,24 +16,23 @@
import contextlib
import functools
-from apache.aurora.client.api.health_check import StatusHealthCheck, Retriable
+from mock import Mock, patch
+from twitter.common.contextutil import temporary_file
+
+from apache.aurora.client.api.health_check import Retriable, StatusHealthCheck
from apache.aurora.client.cli import EXIT_API_ERROR
from apache.aurora.client.cli.client import AuroraCommandLine
from apache.aurora.client.cli.util import AuroraClientCommandTest
-from twitter.common.contextutil import temporary_file
-
from gen.apache.aurora.api.ttypes import (
AssignedTask,
JobKey,
PopulateJobResult,
ScheduledTask,
ScheduleStatusResult,
- TaskConfig,
+ TaskConfig
)
-from mock import Mock, patch
-
class TestRestartCommand(AuroraClientCommandTest):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/client/cli/test_sla.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/cli/test_sla.py b/src/test/python/apache/aurora/client/cli/test_sla.py
index 7d0381c..9a02e89 100644
--- a/src/test/python/apache/aurora/client/cli/test_sla.py
+++ b/src/test/python/apache/aurora/client/cli/test_sla.py
@@ -16,11 +16,11 @@
import contextlib
+from mock import Mock, patch
+
from apache.aurora.client.cli.client import AuroraCommandLine
from apache.aurora.client.cli.util import AuroraClientCommandTest, FakeAuroraCommandContext
-from mock import Mock, patch
-
class TestGetTaskUpCountCommand(AuroraClientCommandTest):
@classmethod
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/client/cli/test_status.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/cli/test_status.py b/src/test/python/apache/aurora/client/cli/test_status.py
index a8269ac..c440849 100644
--- a/src/test/python/apache/aurora/client/cli/test_status.py
+++ b/src/test/python/apache/aurora/client/cli/test_status.py
@@ -16,6 +16,13 @@
import contextlib
+from mock import call, Mock, patch
+
+from apache.aurora.client.cli import EXIT_INVALID_PARAMETER
+from apache.aurora.client.cli.client import AuroraCommandLine
+from apache.aurora.client.cli.util import AuroraClientCommandTest, FakeAuroraCommandContext
+from apache.aurora.common.aurora_job_key import AuroraJobKey
+
from gen.apache.aurora.api.ttypes import (
AssignedTask,
Identity,
@@ -25,18 +32,9 @@ from gen.apache.aurora.api.ttypes import (
ScheduleStatusResult,
TaskConfig,
TaskEvent,
- TaskQuery,
+ TaskQuery
)
-from apache.aurora.client.cli import (
- EXIT_INVALID_PARAMETER
-)
-from apache.aurora.client.cli.client import AuroraCommandLine
-from apache.aurora.common.aurora_job_key import AuroraJobKey
-from apache.aurora.client.cli.util import AuroraClientCommandTest, FakeAuroraCommandContext
-
-from mock import call, Mock, patch
-
class TestJobStatus(AuroraClientCommandTest):
@classmethod
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/client/cli/test_task_run.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/cli/test_task_run.py b/src/test/python/apache/aurora/client/cli/test_task_run.py
index fba812e..c60189c 100644
--- a/src/test/python/apache/aurora/client/cli/test_task_run.py
+++ b/src/test/python/apache/aurora/client/cli/test_task_run.py
@@ -15,12 +15,13 @@
#
import contextlib
+
from mock import Mock, patch
from apache.aurora.client.cli import EXIT_INVALID_PARAMETER
from apache.aurora.client.cli.client import AuroraCommandLine
-from apache.aurora.common.aurora_job_key import AuroraJobKey
from apache.aurora.client.cli.util import AuroraClientCommandTest, FakeAuroraCommandContext
+from apache.aurora.common.aurora_job_key import AuroraJobKey
from gen.apache.aurora.api.ttypes import (
AssignedTask,
@@ -31,7 +32,7 @@ from gen.apache.aurora.api.ttypes import (
ScheduleStatusResult,
TaskConfig,
TaskEvent,
- TaskQuery,
+ TaskQuery
)
@@ -191,4 +192,3 @@ class TestSshCommand(AuroraClientCommandTest):
mock_subprocess.assert_called_with(['ssh', '-t', 'bozo@slavehost',
'cd /slaveroot/slaves/*/frameworks/*/executors/thermos-1287391823/runs/'
'slaverun/sandbox;ls'])
-
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/client/cli/test_update.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/cli/test_update.py b/src/test/python/apache/aurora/client/cli/test_update.py
index 854d583..a357c44 100644
--- a/src/test/python/apache/aurora/client/cli/test_update.py
+++ b/src/test/python/apache/aurora/client/cli/test_update.py
@@ -16,12 +16,13 @@
import contextlib
import functools
+from mock import Mock, patch
from twitter.common.contextutil import temporary_file
-from apache.aurora.client.api.updater import Updater
-from apache.aurora.client.api.health_check import StatusHealthCheck, Retriable
+from apache.aurora.client.api.health_check import Retriable, StatusHealthCheck
from apache.aurora.client.api.job_monitor import JobMonitor
from apache.aurora.client.api.quota_check import QuotaCheck
+from apache.aurora.client.api.updater import Updater
from apache.aurora.client.cli import EXIT_INVALID_CONFIGURATION
from apache.aurora.client.cli.client import AuroraCommandLine
from apache.aurora.client.cli.util import AuroraClientCommandTest, FakeAuroraCommandContext
@@ -43,8 +44,6 @@ from gen.apache.aurora.api.ttypes import (
TaskQuery
)
-from mock import Mock, patch
-
class TestUpdateCommand(AuroraClientCommandTest):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/client/cli/util.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/cli/util.py b/src/test/python/apache/aurora/client/cli/util.py
index e17f256..9d51a2e 100644
--- a/src/test/python/apache/aurora/client/cli/util.py
+++ b/src/test/python/apache/aurora/client/cli/util.py
@@ -16,25 +16,25 @@
import unittest
+from mock import Mock
+
+from apache.aurora.client.cli.context import AuroraCommandContext
+from apache.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
+from apache.aurora.common.cluster import Cluster
+from apache.aurora.common.clusters import Clusters
+
from gen.apache.aurora.api.ttypes import (
AssignedTask,
Response,
ResponseCode,
Result,
+ ScheduledTask,
ScheduleStatus,
ScheduleStatusResult,
- ScheduledTask,
TaskConfig,
- TaskEvent,
+ TaskEvent
)
-from apache.aurora.client.cli.context import AuroraCommandContext
-from apache.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
-from apache.aurora.common.cluster import Cluster
-from apache.aurora.common.clusters import Clusters
-
-from mock import Mock
-
class FakeAuroraCommandContext(AuroraCommandContext):
def __init__(self):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/client/commands/test_admin_sla.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/commands/test_admin_sla.py b/src/test/python/apache/aurora/client/commands/test_admin_sla.py
index cb86f83..df007f2 100644
--- a/src/test/python/apache/aurora/client/commands/test_admin_sla.py
+++ b/src/test/python/apache/aurora/client/commands/test_admin_sla.py
@@ -15,20 +15,17 @@
#
import contextlib
-
from collections import defaultdict
+from mock import Mock, patch
+from twitter.common.contextutil import temporary_file
+
from apache.aurora.client.api import AuroraClientAPI
from apache.aurora.client.api.sla import DomainUpTimeSlaVector
from apache.aurora.client.commands.admin import sla_list_safe_domain, sla_probe_hosts
from apache.aurora.client.commands.util import AuroraClientCommandTest
from apache.aurora.common.aurora_job_key import AuroraJobKey
-from twitter.common.contextutil import temporary_file
-
-from mock import Mock, patch
-
-
MIN_INSTANCE_COUNT = 1
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/client/commands/test_cancel_update.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/commands/test_cancel_update.py b/src/test/python/apache/aurora/client/commands/test_cancel_update.py
index d765431..6473d33 100644
--- a/src/test/python/apache/aurora/client/commands/test_cancel_update.py
+++ b/src/test/python/apache/aurora/client/commands/test_cancel_update.py
@@ -17,24 +17,24 @@
import contextlib
import unittest
-from apache.aurora.common.cluster import Cluster
-from apache.aurora.common.clusters import Clusters
+from mock import Mock, patch
+from twitter.common.contextutil import temporary_file
+
from apache.aurora.client.commands.core import cancel_update
from apache.aurora.client.commands.util import AuroraClientCommandTest
from apache.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
from apache.aurora.common.aurora_job_key import AuroraJobKey
-from twitter.common.contextutil import temporary_file
+from apache.aurora.common.cluster import Cluster
+from apache.aurora.common.clusters import Clusters
from gen.apache.aurora.api.ttypes import (
Identity,
JobKey,
ScheduleStatus,
ScheduleStatusResult,
- TaskQuery,
+ TaskQuery
)
-from mock import Mock, patch
-
class TestClientCancelUpdateCommand(AuroraClientCommandTest):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/client/commands/test_create.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/commands/test_create.py b/src/test/python/apache/aurora/client/commands/test_create.py
index 328b980..09a392f 100644
--- a/src/test/python/apache/aurora/client/commands/test_create.py
+++ b/src/test/python/apache/aurora/client/commands/test_create.py
@@ -17,13 +17,15 @@
import contextlib
import unittest
+from mock import Mock, patch
+from pystachio.config import Config
+from twitter.common import app
+from twitter.common.contextutil import temporary_file
from apache.aurora.client.commands.core import create
from apache.aurora.client.commands.util import AuroraClientCommandTest
from apache.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
from apache.aurora.config import AuroraConfig
-from twitter.common import app
-from twitter.common.contextutil import temporary_file
from gen.apache.aurora.api.ttypes import (
AssignedTask,
@@ -35,12 +37,9 @@ from gen.apache.aurora.api.ttypes import (
ScheduleStatus,
ScheduleStatusResult,
TaskEvent,
- TaskQuery,
+ TaskQuery
)
-from mock import Mock, patch
-from pystachio.config import Config
-
class TestClientCreateCommand(AuroraClientCommandTest):
@classmethod
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/client/commands/test_diff.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/commands/test_diff.py b/src/test/python/apache/aurora/client/commands/test_diff.py
index a9d4581..86e6cf0 100644
--- a/src/test/python/apache/aurora/client/commands/test_diff.py
+++ b/src/test/python/apache/aurora/client/commands/test_diff.py
@@ -17,9 +17,12 @@
import contextlib
import os
+from mock import Mock, patch
+from pystachio.config import Config
+from twitter.common.contextutil import temporary_file
+
from apache.aurora.client.commands.core import diff
from apache.aurora.client.commands.util import AuroraClientCommandTest
-from twitter.common.contextutil import temporary_file
from gen.apache.aurora.api.constants import ACTIVE_STATES
from gen.apache.aurora.api.ttypes import (
@@ -34,12 +37,9 @@ from gen.apache.aurora.api.ttypes import (
ScheduleStatusResult,
TaskConfig,
TaskEvent,
- TaskQuery,
+ TaskQuery
)
-from mock import Mock, patch
-from pystachio.config import Config
-
class TestDiffCommand(AuroraClientCommandTest):
@classmethod
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/client/commands/test_hooks.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/commands/test_hooks.py b/src/test/python/apache/aurora/client/commands/test_hooks.py
index 97ec14e..5e4227f 100644
--- a/src/test/python/apache/aurora/client/commands/test_hooks.py
+++ b/src/test/python/apache/aurora/client/commands/test_hooks.py
@@ -17,12 +17,15 @@
import contextlib
import unittest
+from mock import Mock, patch
+from pystachio.config import Config
+from twitter.common import app
+from twitter.common.contextutil import temporary_file
+
from apache.aurora.client.commands.core import create
from apache.aurora.client.commands.util import AuroraClientCommandTest
from apache.aurora.client.config import AuroraConfig, GlobalHookRegistry
from apache.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
-from twitter.common import app
-from twitter.common.contextutil import temporary_file
from gen.apache.aurora.api.ttypes import (
AssignedTask,
@@ -34,12 +37,9 @@ from gen.apache.aurora.api.ttypes import (
ScheduleStatus,
ScheduleStatusResult,
TaskEvent,
- TaskQuery,
+ TaskQuery
)
-from mock import Mock, patch
-from pystachio.config import Config
-
class CreateHookForTesting(object):
def __init__(self, succeed):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/client/commands/test_kill.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/commands/test_kill.py b/src/test/python/apache/aurora/client/commands/test_kill.py
index 65c8dde..bc3b92b 100644
--- a/src/test/python/apache/aurora/client/commands/test_kill.py
+++ b/src/test/python/apache/aurora/client/commands/test_kill.py
@@ -17,13 +17,15 @@
import contextlib
import unittest
-from apache.aurora.common.cluster import Cluster
-from apache.aurora.common.clusters import Clusters
+from mock import Mock, patch
+from twitter.common.contextutil import temporary_file
+
from apache.aurora.client.commands.core import kill, killall
+from apache.aurora.client.commands.util import AuroraClientCommandTest
from apache.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
from apache.aurora.common.aurora_job_key import AuroraJobKey
-from twitter.common.contextutil import temporary_file
-from apache.aurora.client.commands.util import AuroraClientCommandTest
+from apache.aurora.common.cluster import Cluster
+from apache.aurora.common.clusters import Clusters
from gen.apache.aurora.api.ttypes import (
AssignedTask,
@@ -33,14 +35,11 @@ from gen.apache.aurora.api.ttypes import (
Result,
ScheduledTask,
ScheduleStatus,
- ScheduledTask,
ScheduleStatusResult,
TaskEvent,
- TaskQuery,
+ TaskQuery
)
-from mock import Mock, patch
-
class TestClientKillCommand(AuroraClientCommandTest):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/client/commands/test_listjobs.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/commands/test_listjobs.py b/src/test/python/apache/aurora/client/commands/test_listjobs.py
index 092b707..2afbc98 100644
--- a/src/test/python/apache/aurora/client/commands/test_listjobs.py
+++ b/src/test/python/apache/aurora/client/commands/test_listjobs.py
@@ -17,17 +17,14 @@
import contextlib
import unittest
-from apache.aurora.common.cluster import Cluster
-from apache.aurora.common.clusters import Clusters
+from mock import Mock, patch
+
from apache.aurora.client.commands.core import list_jobs
from apache.aurora.client.commands.util import AuroraClientCommandTest
+from apache.aurora.common.cluster import Cluster
+from apache.aurora.common.clusters import Clusters
-from gen.apache.aurora.api.ttypes import (
- GetJobsResult,
- JobKey,
-)
-
-from mock import Mock, patch
+from gen.apache.aurora.api.ttypes import GetJobsResult, JobKey
class TestListJobs(AuroraClientCommandTest):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/client/commands/test_maintenance.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/commands/test_maintenance.py b/src/test/python/apache/aurora/client/commands/test_maintenance.py
index c684a52..99cbb15 100644
--- a/src/test/python/apache/aurora/client/commands/test_maintenance.py
+++ b/src/test/python/apache/aurora/client/commands/test_maintenance.py
@@ -16,13 +16,15 @@
import contextlib
-from apache.aurora.client.commands.util import AuroraClientCommandTest
+from mock import Mock, patch
+
from apache.aurora.client.commands.maintenance import (
end_maintenance_hosts,
host_maintenance_status,
perform_maintenance_hosts,
- start_maintenance_hosts,
+ start_maintenance_hosts
)
+from apache.aurora.client.commands.util import AuroraClientCommandTest
from gen.apache.aurora.api.ttypes import (
DrainHostsResult,
@@ -31,11 +33,9 @@ from gen.apache.aurora.api.ttypes import (
HostStatus,
MaintenanceMode,
MaintenanceStatusResult,
- StartMaintenanceResult,
+ StartMaintenanceResult
)
-from mock import Mock, patch
-
class TestMaintenanceCommands(AuroraClientCommandTest):
HOSTNAMES = ['us-grf-20', 'us-jim-47', 'us-suz-01']
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/client/commands/test_restart.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/commands/test_restart.py b/src/test/python/apache/aurora/client/commands/test_restart.py
index 29da5ac..fba529f 100644
--- a/src/test/python/apache/aurora/client/commands/test_restart.py
+++ b/src/test/python/apache/aurora/client/commands/test_restart.py
@@ -17,10 +17,12 @@
import contextlib
import functools
+from mock import Mock, patch
+from twitter.common.contextutil import temporary_file
+
+from apache.aurora.client.api.health_check import Retriable, StatusHealthCheck
from apache.aurora.client.commands.core import restart
from apache.aurora.client.commands.util import AuroraClientCommandTest
-from apache.aurora.client.api.health_check import StatusHealthCheck, Retriable
-from twitter.common.contextutil import temporary_file
from gen.apache.aurora.api.ttypes import (
AssignedTask,
@@ -28,11 +30,9 @@ from gen.apache.aurora.api.ttypes import (
PopulateJobResult,
ScheduledTask,
ScheduleStatusResult,
- TaskConfig,
+ TaskConfig
)
-from mock import Mock, patch
-
class TestRestartCommand(AuroraClientCommandTest):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/client/commands/test_run.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/commands/test_run.py b/src/test/python/apache/aurora/client/commands/test_run.py
index dad238b..e9485d2 100644
--- a/src/test/python/apache/aurora/client/commands/test_run.py
+++ b/src/test/python/apache/aurora/client/commands/test_run.py
@@ -16,6 +16,8 @@
import contextlib
+from mock import Mock, patch
+
from apache.aurora.client.commands.run import run
from apache.aurora.client.commands.util import AuroraClientCommandTest
@@ -29,11 +31,9 @@ from gen.apache.aurora.api.ttypes import (
ScheduleStatusResult,
TaskConfig,
TaskEvent,
- TaskQuery,
+ TaskQuery
)
-from mock import Mock, patch
-
class TestRunCommand(AuroraClientCommandTest):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/client/commands/test_ssh.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/commands/test_ssh.py b/src/test/python/apache/aurora/client/commands/test_ssh.py
index bfe24d4..5c6776e 100644
--- a/src/test/python/apache/aurora/client/commands/test_ssh.py
+++ b/src/test/python/apache/aurora/client/commands/test_ssh.py
@@ -16,6 +16,8 @@
import contextlib
+from mock import Mock, patch
+
from apache.aurora.client.commands.ssh import ssh
from apache.aurora.client.commands.util import AuroraClientCommandTest
@@ -29,11 +31,9 @@ from gen.apache.aurora.api.ttypes import (
ScheduleStatusResult,
TaskConfig,
TaskEvent,
- TaskQuery,
+ TaskQuery
)
-from mock import Mock, patch
-
class TestSshCommand(AuroraClientCommandTest):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/client/commands/test_status.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/commands/test_status.py b/src/test/python/apache/aurora/client/commands/test_status.py
index 2b97702..f04f7ca 100644
--- a/src/test/python/apache/aurora/client/commands/test_status.py
+++ b/src/test/python/apache/aurora/client/commands/test_status.py
@@ -17,10 +17,12 @@
import contextlib
import unittest
-from apache.aurora.common.cluster import Cluster
-from apache.aurora.common.clusters import Clusters
+from mock import Mock, patch
+
from apache.aurora.client.commands.core import status
from apache.aurora.client.commands.util import AuroraClientCommandTest
+from apache.aurora.common.cluster import Cluster
+from apache.aurora.common.clusters import Clusters
from gen.apache.aurora.api.ttypes import (
AssignedTask,
@@ -31,11 +33,9 @@ from gen.apache.aurora.api.ttypes import (
ScheduleStatusResult,
TaskConfig,
TaskEvent,
- TaskQuery,
+ TaskQuery
)
-from mock import Mock, patch
-
class TestListJobs(AuroraClientCommandTest):
@classmethod
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/client/commands/test_update.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/commands/test_update.py b/src/test/python/apache/aurora/client/commands/test_update.py
index d51579f..0b1e349 100644
--- a/src/test/python/apache/aurora/client/commands/test_update.py
+++ b/src/test/python/apache/aurora/client/commands/test_update.py
@@ -18,17 +18,19 @@ import contextlib
import functools
import unittest
-from apache.aurora.common.cluster import Cluster
-from apache.aurora.common.clusters import Clusters
+from mock import Mock, patch
+from twitter.common.contextutil import temporary_file
+
+from apache.aurora.client.api.health_check import Retriable, StatusHealthCheck
+from apache.aurora.client.api.job_monitor import JobMonitor
+from apache.aurora.client.api.quota_check import QuotaCheck
+from apache.aurora.client.api.updater import Updater
from apache.aurora.client.commands.core import update
from apache.aurora.client.commands.util import AuroraClientCommandTest
-from apache.aurora.client.api.updater import Updater
-from apache.aurora.client.api.health_check import StatusHealthCheck, Retriable
-from apache.aurora.client.api.quota_check import QuotaCheck
-from apache.aurora.client.api.job_monitor import JobMonitor
from apache.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
+from apache.aurora.common.cluster import Cluster
+from apache.aurora.common.clusters import Clusters
from apache.aurora.config import AuroraConfig
-from twitter.common.contextutil import temporary_file
from gen.apache.aurora.api.constants import ACTIVE_STATES
from gen.apache.aurora.api.ttypes import (
@@ -47,8 +49,6 @@ from gen.apache.aurora.api.ttypes import (
TaskQuery
)
-from mock import Mock, patch
-
class TestUpdateCommand(AuroraClientCommandTest):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/client/commands/util.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/commands/util.py b/src/test/python/apache/aurora/client/commands/util.py
index c28096f..fc9e2f1 100644
--- a/src/test/python/apache/aurora/client/commands/util.py
+++ b/src/test/python/apache/aurora/client/commands/util.py
@@ -16,17 +16,13 @@
import unittest
+from mock import Mock
+
from apache.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
from apache.aurora.common.cluster import Cluster
from apache.aurora.common.clusters import Clusters
-from gen.apache.aurora.api.ttypes import (
- Response,
- ResponseCode,
- Result,
-)
-
-from mock import Mock
+from gen.apache.aurora.api.ttypes import Response, ResponseCode, Result
class AuroraClientCommandTest(unittest.TestCase):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/client/hooks/test_hooked_api.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/hooks/test_hooked_api.py b/src/test/python/apache/aurora/client/hooks/test_hooked_api.py
index 488d2be..93ad465 100644
--- a/src/test/python/apache/aurora/client/hooks/test_hooked_api.py
+++ b/src/test/python/apache/aurora/client/hooks/test_hooked_api.py
@@ -16,12 +16,11 @@
from inspect import getargspec
-from apache.aurora.client.hooks.hooked_api import HookedAuroraClientAPI, NonHookedAuroraClientAPI
-from apache.aurora.client.api import AuroraClientAPI
-from apache.aurora.common.cluster import Cluster
-
from mock import Mock
+from apache.aurora.client.api import AuroraClientAPI
+from apache.aurora.client.hooks.hooked_api import HookedAuroraClientAPI, NonHookedAuroraClientAPI
+from apache.aurora.common.cluster import Cluster
API_METHODS = ('cancel_update', 'create_job', 'kill_job', 'restart', 'start_cronjob', 'update_job')
API_METHODS_WITH_CONFIG_PARAM_ADDED = ('cancel_update', 'kill_job', 'restart', 'start_cronjob')
@@ -69,5 +68,3 @@ def test_api_methods_params(method_name):
else:
assert nonhooked_argspec == hooked_argspec
assert nonhooked_argspec == nonhooked_argspec
-
-
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/client/hooks/test_non_hooked_api.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/hooks/test_non_hooked_api.py b/src/test/python/apache/aurora/client/hooks/test_non_hooked_api.py
index 711f72a..9fba62e 100644
--- a/src/test/python/apache/aurora/client/hooks/test_non_hooked_api.py
+++ b/src/test/python/apache/aurora/client/hooks/test_non_hooked_api.py
@@ -17,9 +17,8 @@
import functools
import unittest
-from apache.aurora.common.aurora_job_key import AuroraJobKey
from apache.aurora.client.hooks.hooked_api import NonHookedAuroraClientAPI
-
+from apache.aurora.common.aurora_job_key import AuroraJobKey
API_METHODS = ('cancel_update', 'create_job', 'kill_job', 'restart', 'start_cronjob', 'update_job')
API_METHODS_WITH_CONFIG_PARAM_ADDED = ('cancel_update', 'kill_job', 'restart', 'start_cronjob')
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/client/test_binding_helper.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/test_binding_helper.py b/src/test/python/apache/aurora/client/test_binding_helper.py
index 338f18a..38f7e15 100644
--- a/src/test/python/apache/aurora/client/test_binding_helper.py
+++ b/src/test/python/apache/aurora/client/test_binding_helper.py
@@ -16,13 +16,13 @@
import textwrap
+from pystachio import Ref
+from pystachio.matcher import Any, Matcher
+from twitter.common.contextutil import temporary_file
+
from apache.aurora.client import binding_helper
from apache.aurora.client.binding_helper import BindingHelper, CachingBindingHelper
from apache.aurora.config import AuroraConfig
-from twitter.common.contextutil import temporary_file
-
-from pystachio import Ref
-from pystachio.matcher import Matcher, Any
GENERIC_CONFIG = """
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/client/test_config.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/test_config.py b/src/test/python/apache/aurora/client/test_config.py
index 8ef0868..6a83a11 100644
--- a/src/test/python/apache/aurora/client/test_config.py
+++ b/src/test/python/apache/aurora/client/test_config.py
@@ -16,6 +16,7 @@
import os
+import pytest
from twitter.common.contextutil import temporary_dir, temporary_file
from apache.aurora.client import config
@@ -25,9 +26,6 @@ from apache.aurora.config.schema.base import Announcer, Job, MB, Resources, Task
from gen.apache.aurora.api.constants import DEFAULT_ENVIRONMENT
-import pytest
-
-
MESOS_CONFIG_BASE = """
HELLO_WORLD = Job(
name = 'hello_world',
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/common/test_aurora_job_key.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/common/test_aurora_job_key.py b/src/test/python/apache/aurora/common/test_aurora_job_key.py
index 34f1ead..036da82 100644
--- a/src/test/python/apache/aurora/common/test_aurora_job_key.py
+++ b/src/test/python/apache/aurora/common/test_aurora_job_key.py
@@ -18,6 +18,7 @@ import unittest
from apache.aurora.common.aurora_job_key import AuroraJobKey
+
# TODO(ksweeney): Moar coverage
class AuroraJobKeyTest(unittest.TestCase):
def test_basic(self):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/common/test_cluster.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/common/test_cluster.py b/src/test/python/apache/aurora/common/test_cluster.py
index 6ef735f..d35c2e3 100644
--- a/src/test/python/apache/aurora/common/test_cluster.py
+++ b/src/test/python/apache/aurora/common/test_cluster.py
@@ -14,14 +14,10 @@
# limitations under the License.
#
-from apache.aurora.common.cluster import Cluster
-
-from pystachio import (
- Default,
- Integer,
- Required,
- String)
import pytest
+from pystachio import Default, Integer, Required, String
+
+from apache.aurora.common.cluster import Cluster
def test_simple():
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/common/test_cluster_option.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/common/test_cluster_option.py b/src/test/python/apache/aurora/common/test_cluster_option.py
index 850b7d6..1918bac 100644
--- a/src/test/python/apache/aurora/common/test_cluster_option.py
+++ b/src/test/python/apache/aurora/common/test_cluster_option.py
@@ -15,13 +15,11 @@
#
import pytest
-
from twitter.common import options
from apache.aurora.common.cluster import Cluster
-from apache.aurora.common.clusters import Clusters
from apache.aurora.common.cluster_option import ClusterOption
-
+from apache.aurora.common.clusters import Clusters
CLUSTER_LIST = Clusters((
Cluster(name = 'smf1'),
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/common/test_clusters.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/common/test_clusters.py b/src/test/python/apache/aurora/common/test_clusters.py
index 0a0329b..4a9d24b 100644
--- a/src/test/python/apache/aurora/common/test_clusters.py
+++ b/src/test/python/apache/aurora/common/test_clusters.py
@@ -17,12 +17,11 @@
import json
import os
-from apache.aurora.common.clusters import Clusters, Parser
-from twitter.common.contextutil import temporary_dir
-
import pytest
import yaml
+from twitter.common.contextutil import temporary_dir
+from apache.aurora.common.clusters import Clusters, Parser
TEST_YAML = """
__default: &default
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/common/test_http_signaler.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/common/test_http_signaler.py b/src/test/python/apache/aurora/common/test_http_signaler.py
index 661a017..00541b3 100644
--- a/src/test/python/apache/aurora/common/test_http_signaler.py
+++ b/src/test/python/apache/aurora/common/test_http_signaler.py
@@ -14,15 +14,14 @@
# limitations under the License.
#
-from socket import timeout as SocketTimeout
import unittest
+from socket import timeout as SocketTimeout
+import mox
from twitter.common.lang import Compatibility
from apache.aurora.common.http_signaler import HttpSignaler
-import mox
-
if Compatibility.PY3:
import urllib.request as urllib_request
else:
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/config/test_base.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/config/test_base.py b/src/test/python/apache/aurora/config/test_base.py
index 31ad21f..372b1cc 100644
--- a/src/test/python/apache/aurora/config/test_base.py
+++ b/src/test/python/apache/aurora/config/test_base.py
@@ -15,7 +15,6 @@
#
import pytest
-
from twitter.common.contextutil import temporary_file
from apache.aurora.config import AuroraConfig, PortResolver
@@ -26,12 +25,11 @@ from apache.aurora.config.schema.base import (
Job,
Process,
Resources,
- Task,
+ Task
)
from gen.apache.aurora.api.ttypes import Identity
-
resolve = PortResolver.resolve
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/config/test_constraint_parsing.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/config/test_constraint_parsing.py b/src/test/python/apache/aurora/config/test_constraint_parsing.py
index 4249269..310d0c3 100644
--- a/src/test/python/apache/aurora/config/test_constraint_parsing.py
+++ b/src/test/python/apache/aurora/config/test_constraint_parsing.py
@@ -14,9 +14,10 @@
# limitations under the License.
#
-import pytest
import unittest
+import pytest
+
from apache.aurora.config.thrift import constraints_to_thrift
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/config/test_loader.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/config/test_loader.py b/src/test/python/apache/aurora/config/test_loader.py
index 619b270..1170bd5 100644
--- a/src/test/python/apache/aurora/config/test_loader.py
+++ b/src/test/python/apache/aurora/config/test_loader.py
@@ -17,16 +17,14 @@
import json
import tempfile
+import pytest
+from pystachio import Environment
from twitter.common.contextutil import temporary_file
from apache.aurora.config import AuroraConfig
from apache.aurora.config.loader import AuroraConfigLoader
from apache.thermos.config.loader import ThermosTaskWrapper
-from pystachio import Environment
-import pytest
-
-
BAD_MESOS_CONFIG = """
3 2 1 3 2 4 2 3
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1c058f72/src/test/python/apache/aurora/config/test_thrift.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/config/test_thrift.py b/src/test/python/apache/aurora/config/test_thrift.py
index 93b8f6f..334011d 100644
--- a/src/test/python/apache/aurora/config/test_thrift.py
+++ b/src/test/python/apache/aurora/config/test_thrift.py
@@ -17,34 +17,19 @@
import getpass
import re
+import pytest
+from pystachio import Map, String
+from pystachio.naming import frozendict
+
from apache.aurora.config import AuroraConfig
from apache.aurora.config.schema.base import Job, SimpleTask
-from apache.aurora.config.thrift import (
- convert as convert_pystachio_to_thrift,
- InvalidConfig,
- task_instance_from_job,
-)
-from apache.thermos.config.schema import (
- Process,
- Resources,
- Task,
-)
+from apache.aurora.config.thrift import convert as convert_pystachio_to_thrift
+from apache.aurora.config.thrift import InvalidConfig, task_instance_from_job
+from apache.thermos.config.schema import Process, Resources, Task
from gen.apache.aurora.api.constants import GOOD_IDENTIFIER_PATTERN_PYTHON
-from gen.apache.aurora.api.ttypes import (
- CronCollisionPolicy,
- JobKey,
- Identity,
-)
-from gen.apache.aurora.test.constants import (
- INVALID_IDENTIFIERS,
- VALID_IDENTIFIERS,
-)
-
-from pystachio import Map, String
-from pystachio.naming import frozendict
-import pytest
-
+from gen.apache.aurora.api.ttypes import CronCollisionPolicy, Identity, JobKey
+from gen.apache.aurora.test.constants import INVALID_IDENTIFIERS, VALID_IDENTIFIERS
HELLO_WORLD = Job(
name = 'hello_world',