You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by ma...@apache.org on 2014/02/13 17:47:52 UTC
git commit: Fixing python test failure.
Updated Branches:
refs/heads/master 29aecee8c -> 4dca44926
Fixing python test failure.
Reviewed at https://reviews.apache.org/r/18086/
Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/4dca4492
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/4dca4492
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/4dca4492
Branch: refs/heads/master
Commit: 4dca44926d07347a54f2ebab1027e8982150c6c1
Parents: 29aecee
Author: Maxim Khutornenko <ma...@apache.org>
Authored: Thu Feb 13 08:47:30 2014 -0800
Committer: Maxim Khutornenko <ma...@apache.org>
Committed: Thu Feb 13 08:47:30 2014 -0800
----------------------------------------------------------------------
src/test/python/apache/aurora/client/commands/test_run.py | 4 ++--
src/test/python/apache/aurora/client/commands/test_ssh.py | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/4dca4492/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 abcc275..bfb9ecc 100644
--- a/src/test/python/apache/aurora/client/commands/test_run.py
+++ b/src/test/python/apache/aurora/client/commands/test_run.py
@@ -19,6 +19,7 @@ import contextlib
from apache.aurora.client.commands.run import run
from apache.aurora.client.commands.util import AuroraClientCommandTest
+from gen.apache.aurora.constants import LIVE_STATES
from gen.apache.aurora.ttypes import (
AssignedTask,
Identity,
@@ -121,8 +122,7 @@ class TestRunCommand(AuroraClientCommandTest):
# and then prints the result.
mock_scheduler_proxy.getTasksStatus.assert_called_with(TaskQuery(jobName='hello',
environment='test', owner=Identity(role='mchucarroll'),
- statuses=set([ScheduleStatus.RUNNING, ScheduleStatus.KILLING, ScheduleStatus.RESTARTING,
- ScheduleStatus.PREEMPTING])))
+ statuses=LIVE_STATES))
# The mock status call returns 3 three ScheduledTasks, so three commands should have been run
assert mock_subprocess.call_count == 3
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/4dca4492/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 d0b9188..86402f6 100644
--- a/src/test/python/apache/aurora/client/commands/test_ssh.py
+++ b/src/test/python/apache/aurora/client/commands/test_ssh.py
@@ -19,6 +19,7 @@ import contextlib
from apache.aurora.client.commands.ssh import ssh
from apache.aurora.client.commands.util import AuroraClientCommandTest
+from gen.apache.aurora.constants import LIVE_STATES
from gen.apache.aurora.ttypes import (
AssignedTask,
Identity,
@@ -111,8 +112,7 @@ class TestSshCommand(AuroraClientCommandTest):
# and then prints the result.
mock_scheduler_proxy.getTasksStatus.assert_called_with(TaskQuery(jobName='hello',
environment='test', owner=Identity(role='mchucarroll'), instanceIds=set([1]),
- statuses=set([ScheduleStatus.RUNNING, ScheduleStatus.KILLING, ScheduleStatus.RESTARTING,
- ScheduleStatus.PREEMPTING])))
+ statuses=LIVE_STATES))
mock_subprocess.assert_called_with(['ssh', '-t', 'mchucarroll@slavehost',
'cd /slaveroot/slaves/*/frameworks/*/executors/thermos-1287391823/runs/'
'slaverun/sandbox;ls'])