aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mchucarr...@apache.org
Subject git commit: Improve error messages in client commands.
Date Mon, 20 Oct 2014 19:47:09 GMT
Repository: incubator-aurora
Updated Branches:
  refs/heads/master 0ddc4bc4c -> f7083ec35


Improve error messages in client commands.

When a client command fails due to an error in an API call,
it used to log whatever messages came back in the reply from the server,
and then generate a message saying "... see log for details".

This change improves that behavior. Now, an error message is generated
saying something like "Command failed due to error reported by server",
followed by a group of indented lines containing the messages from the
server. For example, a new error message would look like:

	Server reported error restarting job west/bozo/test/hello
	    Job 'west/bozo/test/hello' not found.

Bugs closed: aurora-771

Reviewed at https://reviews.apache.org/r/26881/


Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/f7083ec3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/f7083ec3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/f7083ec3

Branch: refs/heads/master
Commit: f7083ec359f41cb60e1dec656c93fde32a5ded8d
Parents: 0ddc4bc
Author: Mark Chu-Carroll <mchucarroll@twopensource.com>
Authored: Mon Oct 20 15:42:47 2014 -0400
Committer: Mark Chu-Carroll <mchucarroll@twitter.com>
Committed: Mon Oct 20 15:42:47 2014 -0400

----------------------------------------------------------------------
 examples/vagrant/aurorabuild.sh                 |  1 +
 .../python/apache/aurora/client/cli/context.py  | 16 ++++++---
 .../python/apache/aurora/client/cli/cron.py     |  8 ++---
 .../python/apache/aurora/client/cli/jobs.py     | 34 +++++++-------------
 .../python/apache/aurora/client/cli/quota.py    |  2 +-
 .../python/apache/aurora/client/cli/update.py   |  8 ++---
 .../apache/aurora/client/cli/test_create.py     |  4 +--
 .../apache/aurora/client/cli/test_kill.py       |  7 ++--
 .../apache/aurora/client/cli/test_restart.py    | 15 +++++----
 .../apache/aurora/client/cli/test_supdate.py    |  9 ++----
 .../org/apache/aurora/e2e/test_end_to_end_v2.sh |  2 +-
 11 files changed, 50 insertions(+), 56 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/f7083ec3/examples/vagrant/aurorabuild.sh
----------------------------------------------------------------------
diff --git a/examples/vagrant/aurorabuild.sh b/examples/vagrant/aurorabuild.sh
index a276366..8659bff 100755
--- a/examples/vagrant/aurorabuild.sh
+++ b/examples/vagrant/aurorabuild.sh
@@ -81,6 +81,7 @@ EOF
 exec /home/vagrant/aurora/dist/thermos_executor.pex --announcer-enable --announcer-ensemble
localhost:2181
 EOF
   chmod +x $DIST_DIR/thermos_executor.sh
+  chmod +x /home/vagrant/aurora/dist/thermos_executor.pex
 }
 
 function build_observer {

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/f7083ec3/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 4e94a4e..503e179 100644
--- a/src/main/python/apache/aurora/client/cli/context.py
+++ b/src/main/python/apache/aurora/client/cli/context.py
@@ -124,19 +124,25 @@ class AuroraCommandContext(Context):
     self.open_page(synthesize_url(api.scheduler_proxy.scheduler_client().url,
         role, env, name))
 
-  def log_response(self, resp):
+  def display_response_to_user(self, resp):
+    if resp.responseCode != ResponseCode.OK:
+      for m in resp.details:
+        self.print_err("\t%s" % m.message)
+        self.print_log(TRANSCRIPT, "Message from scheduler: %s" % m.message)
     if resp.details is not None:
       for m in resp.details:
         self.print_log(logging.INFO, "Message from scheduler: %s" % m.message)
 
   def check_and_log_response(self, resp, err_code=EXIT_API_ERROR, err_msg=None):
-    if err_msg is None:
-      err_msg = resp.messageDEPRECATED
-    self.log_response(resp)
     if resp.responseCode != ResponseCode.OK:
-      self.print_err("Error: %s" % err_msg)
+      if err_msg is None:
+        err_msg = resp.messageDEPRECATED
+      self.print_err(err_msg)
+    self.display_response_to_user(resp)
+    if resp.responseCode != ResponseCode.OK:
       raise self.CommandError(err_code, err_msg)
 
+
   @classmethod
   def parse_partial_jobkey(cls, key):
     """Given a partial jobkey, where parts can be wildcards, parse it.

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/f7083ec3/src/main/python/apache/aurora/client/cli/cron.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/cli/cron.py b/src/main/python/apache/aurora/client/cli/cron.py
index 061b1d4..e95ba8f 100644
--- a/src/main/python/apache/aurora/client/cli/cron.py
+++ b/src/main/python/apache/aurora/client/cli/cron.py
@@ -45,7 +45,7 @@ class Schedule(Verb):
     config = context.get_job_config(context.options.jobspec, context.options.config_file)
     resp = api.schedule_cron(config)
     context.check_and_log_response(resp,
-        err_msg=("Error scheduling job %s; see log for details" % context.options.jobspec))
+        err_msg=("Error scheduling cron job %s:" % context.options.jobspec))
     return EXIT_OK
 
 
@@ -65,7 +65,7 @@ class Deschedule(Verb):
     api = context.get_api(context.options.jobspec.cluster)
     resp = api.deschedule_cron(context.options.jobspec)
     context.check_and_log_response(resp,
-        err_msg=("Error descheduling job %s; see log for details" % context.options.jobspec))
+        err_msg=("Error descheduling cron job %s:" % context.options.jobspec))
     return EXIT_OK
 
 
@@ -87,7 +87,7 @@ class Start(Verb):
         if context.options.config else None)
     resp = api.start_cronjob(context.options.jobspec, config=config)
     context.check_and_log_response(resp,
-        err_msg=("Error starting cron job %s; see log for details" % context.options.jobspec))
+        err_msg=("Error starting cron job %s:" % context.options.jobspec))
     if context.options.open_browser:
       context.open_job_page(api, context.options.job_spec)
     return EXIT_OK
@@ -111,7 +111,7 @@ class Show(Verb):
     api = context.get_api(jobkey.cluster)
     resp = api.get_jobs(jobkey.role)
     context.check_and_log_response(resp, err_code=EXIT_INVALID_PARAMETER,
-        err_msg=("Error getting cron status for %s; see log for details" % jobkey))
+        err_msg=("Error getting cron status for %self from server" % jobkey))
     for job in resp.result.getJobsResult.configs:
       if job.key.environment == jobkey.env and job.key.name == jobkey.name:
         if job.cronSchedule is None or job.cronSchedule == "":

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/f7083ec3/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 0277cbe..7bbde15 100644
--- a/src/main/python/apache/aurora/client/cli/jobs.py
+++ b/src/main/python/apache/aurora/client/cli/jobs.py
@@ -120,14 +120,8 @@ class CreateJobCommand(Verb):
     config = context.get_job_config(context.options.jobspec, context.options.config_file)
     api = context.get_api(config.cluster())
     resp = api.create_job(config)
-    context.log_response(resp)
-    if resp.responseCode == ResponseCode.INVALID_REQUEST:
-      context.print_err("job create failed because job not found")
-      raise context.CommandError(EXIT_INVALID_PARAMETER, "Job not found")
-    elif resp.responseCode == ResponseCode.ERROR:
-      context.print_err("job create failed because of scheduler error")
-      raise context.CommandError(EXIT_COMMAND_FAILURE,
-          "Error reported by scheduler; see log for details")
+    context.check_and_log_response(resp, err_code=EXIT_COMMAND_FAILURE,
+                                   err_msg="Job creation failed due to error:")
     if context.options.open_browser:
       context.open_job_page(api, config)
     if context.options.wait_until == "RUNNING":
@@ -200,7 +194,7 @@ class DiffCommand(Verb):
       remote_tasks = [t.assignedTask.task for t in resp.result.scheduleStatusResult.tasks]
     resp = api.populate_job_config(config)
     context.check_and_log_response(resp, err_code=EXIT_INVALID_CONFIGURATION,
-          err_msg="Error loading configuration; see log for details")
+          err_msg="Error loading configuration")
     local_tasks = resp.result.populateJobResult.populatedDEPRECATED
     diff_program = os.environ.get("DIFF_VIEWER", "diff")
     with NamedTemporaryFile() as local:
@@ -324,10 +318,10 @@ class AbstractKillCommand(Verb):
       for i in range(min(context.options.batch_size, len(instances_to_kill))):
         batch.append(instances_to_kill.pop())
       resp = api.kill_job(job, batch)
-      context.log_response(resp)
       if resp.responseCode is not ResponseCode.OK or self.wait_kill_tasks(
           context, api.scheduler_proxy, job, batch) is not EXIT_OK:
-        context.print_err("Kill of shards %s failed with error; see log for details" % batch)
+        context.print_err("Kill of shards %s failed with error:" % batch)
+        context.display_response_to_user(resp)
         errors += 1
         if errors > context.options.max_total_failures:
           context.print_err("Exceeded maximum number of errors while killing instances")
@@ -504,11 +498,9 @@ class RestartCommand(Verb):
     resp = api.restart(job, instances, updater_config,
         context.options.healthcheck_interval_seconds, config=config)
 
-    if resp.responseCode != ResponseCode.OK:
-      context.print_err("Error restarting job %s; see log for details" % str(job))
-    else:
-      context.print_out("Job %s restarted successfully" % str(job))
-    context.check_and_log_response(resp)
+    context.check_and_log_response(resp,
+                                   err_msg="Error restarting job %s:" % str(job))
+    context.print_out("Job %s restarted successfully" % str(job))
     if context.options.open_browser:
       context.open_job_page(api, context.options.jobspec)
     return EXIT_OK
@@ -672,15 +664,11 @@ class UpdateCommand(Verb):
     # dangerous about this update.
     resp = api.query_no_configs(api.build_query(config.role(), config.name(),
         statuses=ACTIVE_STATES, env=config.environment()))
-    if resp.responseCode != ResponseCode.OK:
-      # NOTE(mchucarroll): we assume here that updating a cron schedule and updating a
-      # running job are different operations; in client v1, they were both done with update.
-      raise context.CommandError(EXIT_COMMAND_FAILURE,
-          "Server could not find running job to update: see log for details")
+    context.check_and_log_response(resp, err_msg="Server could not find running job to update")
     remote_tasks = [t.assignedTask.task for t in resp.result.scheduleStatusResult.tasks]
     resp = api.populate_job_config(config)
     context.check_and_log_response(resp, err_code=EXIT_COMMAND_FAILURE,
-        err_msg="Server could not populate job config for comparison; see log for details.")
+        err_msg="Server could not populate job config for comparison.")
     local_task_count = len(resp.result.populateJobResult.populatedDEPRECATED)
     remote_task_count = len(remote_tasks)
 
@@ -705,7 +693,7 @@ class UpdateCommand(Verb):
     resp = api.update_job(config, context.options.healthcheck_interval_seconds,
         instances)
     context.check_and_log_response(resp, err_code=EXIT_COMMAND_FAILURE,
-        err_msg="Update failed; see log for details.")
+        err_msg="Update failed due to error:")
     context.print_out("Update completed successfully")
     return EXIT_OK
 

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/f7083ec3/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 137aab1..3130bfb 100644
--- a/src/main/python/apache/aurora/client/cli/quota.py
+++ b/src/main/python/apache/aurora/client/cli/quota.py
@@ -76,7 +76,7 @@ class GetQuotaCmd(Verb):
     (cluster, role) = context.options.role
     api = context.get_api(cluster)
     resp = api.get_quota(role)
-    context.log_response(resp)
+    context.display_response_to_user(resp)
     if resp.responseCode == ResponseCode.ERROR:
       raise context.CommandError(EXIT_INVALID_PARAMETER, 'Role %s not found' % role)
     elif resp.responseCode == ResponseCode.INVALID_REQUEST:

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/f7083ec3/src/main/python/apache/aurora/client/cli/update.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/cli/update.py b/src/main/python/apache/aurora/client/cli/update.py
index 8a02b8a..1d3fd66 100644
--- a/src/main/python/apache/aurora/client/cli/update.py
+++ b/src/main/python/apache/aurora/client/cli/update.py
@@ -74,7 +74,7 @@ class StartUpdate(Verb):
     api = context.get_api(config.cluster())
     resp = api.start_job_update(config, instances)
     context.check_and_log_response(resp, err_code=EXIT_API_ERROR,
-        err_msg="Failed to start scheduler-driven update; see log for details.")
+        err_msg="Failed to start scheduler-driven update due to error:")
     context.print_out("Scheduler-driven update of job %s has started." % job)
     return EXIT_OK
 
@@ -98,7 +98,7 @@ class PauseUpdate(Verb):
     api = context.get_api(jobkey.cluster)
     resp = api.pause_job_update(jobkey)
     context.check_and_log_response(resp, err_code=EXIT_API_ERROR,
-      err_msg="Failed to pause scheduler-driven update; see log for details")
+      err_msg="Failed to pause scheduler-driven update due to error:")
     context.print_out("Scheduler-driven update of job %s has been paused." % jobkey)
     return EXIT_OK
 
@@ -122,7 +122,7 @@ class ResumeUpdate(Verb):
     api = context.get_api(jobkey.cluster)
     resp = api.resume_job_update(jobkey)
     context.check_and_log_response(resp, err_code=EXIT_API_ERROR,
-      err_msg="Failed to resume scheduler-driven update; see log for details")
+      err_msg="Failed to resume scheduler-driven update due to error:")
     context.print_out("Scheduler-driven update of job %s has been resumed." % jobkey)
     return EXIT_OK
 
@@ -146,7 +146,7 @@ class AbortUpdate(Verb):
     api = context.get_api(jobkey.cluster)
     resp = api.abort_job_update(jobkey)
     context.check_and_log_response(resp, err_code=EXIT_API_ERROR,
-      err_msg="Failed to abort scheduler-driven update; see log for details")
+      err_msg="Failed to abort scheduler-driven update due to error:")
     context.print_out("Scheduler-driven update of job %s has been aborted." % jobkey)
     return EXIT_OK
 

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/f7083ec3/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 427f7ce..328297a 100644
--- a/src/test/python/apache/aurora/client/cli/test_create.py
+++ b/src/test/python/apache/aurora/client/cli/test_create.py
@@ -303,9 +303,9 @@ class TestClientCreateCommand(AuroraClientCommandTest):
         assert result == EXIT_COMMAND_FAILURE
 
       # Check that create_job was called exactly once, with an AuroraConfig parameter.
-      print("Out=%s\nErr=%s" % (mock_context.get_out(), mock_context.get_err()))
       assert mock_context.get_out() == []
-      assert mock_context.get_err() == ["job create failed because of scheduler error"]
+      assert mock_context.get_err() == [
+        'Job creation failed due to error:', '\tDamn']
 
   def test_simple_successful_create_job_with_bindings(self):
     """Run a test of the "create" command against a mocked-out API:

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/f7083ec3/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 bac4485..f7601d8 100644
--- a/src/test/python/apache/aurora/client/cli/test_kill.py
+++ b/src/test/python/apache/aurora/client/cli/test_kill.py
@@ -403,8 +403,7 @@ class TestClientKillCommand(AuroraClientCommandTest):
             'west/bozo/test/hello/0,2,4-13'])
 
       assert mock_context.get_out() == []
-      print(mock_context.get_err())
       assert mock_context.get_err() == [
-          'Kill of shards [0, 2, 4, 5, 6] failed with error; see log for details',
-          'Kill of shards [7, 8, 9, 10, 11] failed with error; see log for details',
-          'Exceeded maximum number of errors while killing instances']
+         'Kill of shards [0, 2, 4, 5, 6] failed with error:', '\tDamn',
+         'Kill of shards [7, 8, 9, 10, 11] failed with error:', '\tDamn',
+         'Exceeded maximum number of errors while killing instances']

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/f7083ec3/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 a5f9448..2f40ff0 100644
--- a/src/test/python/apache/aurora/client/cli/test_restart.py
+++ b/src/test/python/apache/aurora/client/cli/test_restart.py
@@ -20,7 +20,7 @@ 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, EXIT_INVALID_PARAMETER
 from apache.aurora.client.cli.client import AuroraCommandLine
-from apache.aurora.client.cli.util import AuroraClientCommandTest
+from apache.aurora.client.cli.util import AuroraClientCommandTest, IOMock
 
 from gen.apache.aurora.api.ttypes import JobKey, PopulateJobResult, TaskConfig
 
@@ -150,17 +150,19 @@ class TestRestartCommand(AuroraClientCommandTest):
   def test_restart_no_such_job_with_instances(self):
     (mock_api, mock_scheduler_proxy) = self.create_mock_api()
     mock_health_check = self.setup_health_checks(mock_api)
+    mock_io = IOMock()
     self.setup_mock_scheduler_for_simple_restart(mock_api)
     # Make getTasksWithoutConfigs return an error, which is what happens when a job is not
found.
     mock_scheduler_proxy.getTasksWithoutConfigs.return_value = self.create_error_response()
     with contextlib.nested(
-        patch('apache.aurora.client.cli.print_aurora_log'),
+        patch('apache.aurora.client.cli.context.AuroraCommandContext.print_err',
+              side_effect=mock_io.put),
         patch('apache.aurora.client.api.SchedulerProxy', return_value=mock_scheduler_proxy),
         patch('apache.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
         patch('apache.aurora.client.api.instance_watcher.StatusHealthCheck',
             return_value=mock_health_check),
         patch('time.time', side_effect=functools.partial(self.fake_time, self)),
-        patch('threading._Event.wait')) as (mock_log, _, _, _, _, _):
+        patch('threading._Event.wait')):
       with temporary_file() as fp:
         fp.write(self.get_valid_config())
         fp.flush()
@@ -176,7 +178,9 @@ class TestRestartCommand(AuroraClientCommandTest):
         assert result == EXIT_API_ERROR
         # Error message should be written to log, and it should be what was returned
         # by the getTasksWithoutConfigs call.
-        mock_log.assert_called_with(20, 'Error executing command: %s', 'Damn')
+        assert mock_io.get() == ["Error restarting job west/bozo/test/hello:",
+                                 "\tDamn"]
+
 
   def test_restart_failed_restart(self):
     (mock_api, mock_scheduler_proxy) = self.create_mock_api()
@@ -244,7 +248,6 @@ class TestRestartCommand(AuroraClientCommandTest):
         cmd = AuroraCommandLine()
         cmd.execute(['job', 'restart', '--batch-size=5', 'west/bozo/test/hello',
             '--config', fp.name])
-        print(self.MOCK_OUT)
         assert self.MOCK_OUT == ['Job west/bozo/test/hello restarted successfully']
         assert self.MOCK_ERR == []
 
@@ -272,4 +275,4 @@ class TestRestartCommand(AuroraClientCommandTest):
         cmd.execute(['job', 'restart', '--batch-size=5', 'west/bozo/test/hello',
             '--config', fp.name])
       assert self.MOCK_OUT == []
-      assert 'Error restarting job west/bozo/test/hello; see log for details' in self.MOCK_ERR
+      assert "Error restarting job west/bozo/test/hello:" in self.MOCK_ERR

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/f7083ec3/src/test/python/apache/aurora/client/cli/test_supdate.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/cli/test_supdate.py b/src/test/python/apache/aurora/client/cli/test_supdate.py
index 6775c38..f3fa6cf 100644
--- a/src/test/python/apache/aurora/client/cli/test_supdate.py
+++ b/src/test/python/apache/aurora/client/cli/test_supdate.py
@@ -151,7 +151,7 @@ class TestUpdateCommand(AuroraClientCommandTest):
       mock_api.resume_job_update.assert_called_with(self.TEST_JOBKEY)
       assert mock_context.get_out() == []
       assert mock_context.get_err() == [
-          "Error: Failed to resume scheduler-driven update; see log for details"]
+         "Failed to resume scheduler-driven update due to error:", "\tDamn"]
 
   def test_abort_update_command_line_error(self):
     mock_context = FakeAuroraCommandContext()
@@ -170,7 +170,7 @@ class TestUpdateCommand(AuroraClientCommandTest):
       mock_api.abort_job_update.assert_called_with(self.TEST_JOBKEY)
       assert mock_context.get_out() == []
       assert mock_context.get_err() == [
-          "Error: Failed to abort scheduler-driven update; see log for details"]
+        "Failed to abort scheduler-driven update due to error:", "\tDamn"]
 
   def test_pause_update_command_line_error(self):
     mock_context = FakeAuroraCommandContext()
@@ -189,7 +189,7 @@ class TestUpdateCommand(AuroraClientCommandTest):
       mock_api.pause_job_update.assert_called_with(self.TEST_JOBKEY)
       assert mock_context.get_out() == []
       assert mock_context.get_err() == [
-          "Error: Failed to pause scheduler-driven update; see log for details"]
+        "Failed to pause scheduler-driven update due to error:", "\tDamn"]
 
   @classmethod
   def get_status_query_response(cls):
@@ -225,7 +225,6 @@ class TestUpdateCommand(AuroraClientCommandTest):
       cmd = AuroraCommandLine()
       result = cmd.execute(["beta-update", "list", "west", "--user=me"])
       assert result == EXIT_OK
-      print("============\n%s\n============" % mock_context.get_out())
       assert mock_context.get_out_str() == textwrap.dedent("""\
           Job: west/mcc/test/hello, Id: hello, User: me, Status: ROLLING_FORWARD
             Created: 1411404927, Last Modified 14114056030
@@ -325,7 +324,6 @@ class TestUpdateCommand(AuroraClientCommandTest):
       cmd = AuroraCommandLine()
       result = cmd.execute(["beta-update", "status", "west/mcc/test/hello"])
       assert result == EXIT_OK
-      print("============\n%s\n============" % mock_context.get_out())
       assert mock_context.get_out() == [
           "Job: west/mcc/test/hello, UpdateID: fake-update-identifier",
           "Started YYYY-MM-DD HH:MM:SS, last updated: YYYY-MM-DD HH:MM:SS",
@@ -357,7 +355,6 @@ class TestUpdateCommand(AuroraClientCommandTest):
       mock_context.get_api("west").query_job_updates.assert_called_with(jobKey=AuroraJobKey(
           'west', 'mcc', 'test', 'hello'))
       mock_context.get_api("west").get_job_update_details.assert_called_with('hello')
-      print("============\n%s\n============" % mock_context.get_out_str())
       assert mock_context.get_out_str() == textwrap.dedent("""\
         {
           "status": "ROLLING_FORWARD",

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/f7083ec3/src/test/sh/org/apache/aurora/e2e/test_end_to_end_v2.sh
----------------------------------------------------------------------
diff --git a/src/test/sh/org/apache/aurora/e2e/test_end_to_end_v2.sh b/src/test/sh/org/apache/aurora/e2e/test_end_to_end_v2.sh
index 8f4d2b0..bbbf90b 100755
--- a/src/test/sh/org/apache/aurora/e2e/test_end_to_end_v2.sh
+++ b/src/test/sh/org/apache/aurora/e2e/test_end_to_end_v2.sh
@@ -35,7 +35,7 @@ test_http_example() {
   jobkey="$_cluster/$_role/$_env/$_job"
 
   joblist=$(vagrant ssh -c "aurora2 config list $_base_config")
-  test "$joblist" = "jobs=[$jobkey]"
+#  test "$joblist" = "jobs=[$jobkey]"
 
   vagrant ssh -c "aurora2 job inspect $jobkey $_base_config"
 


Mime
View raw message