aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wfar...@apache.org
Subject aurora git commit: Fix test fixture issue causing failing tests to report as passing.
Date Fri, 01 May 2015 00:10:07 GMT
Repository: aurora
Updated Branches:
  refs/heads/master 975318f90 -> f9b60c6a2


Fix test fixture issue causing failing tests to report as passing.

Bugs closed: AURORA-1301

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


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

Branch: refs/heads/master
Commit: f9b60c6a2f44bbaa613a03bfa677a505995ead0a
Parents: 975318f
Author: Bill Farner <wfarner@apache.org>
Authored: Thu Apr 30 17:09:51 2015 -0700
Committer: Bill Farner <wfarner@apache.org>
Committed: Thu Apr 30 17:09:51 2015 -0700

----------------------------------------------------------------------
 src/test/python/apache/aurora/client/cli/test_diff.py | 4 +---
 src/test/python/apache/aurora/client/cli/test_task.py | 4 ----
 src/test/python/apache/aurora/client/cli/util.py      | 2 +-
 3 files changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/aurora/blob/f9b60c6a/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 f6ce00e..da52105 100644
--- a/src/test/python/apache/aurora/client/cli/test_diff.py
+++ b/src/test/python/apache/aurora/client/cli/test_diff.py
@@ -73,7 +73,7 @@ class TestDiffCommand(AuroraClientCommandTest):
     with contextlib.nested(
         patch('apache.aurora.client.api.SchedulerProxy', return_value=mock_scheduler_proxy),
         patch('subprocess.call', return_value=0),
-        patch('json.loads', return_value=Mock())) as (_, _, subprocess_patch, _):
+        patch('json.loads', return_value=Mock())) as (_, subprocess_patch, _):
 
       mock_scheduler_proxy.getTasksStatus.return_value = self.create_status_response()
       self.setup_populate_job_config(mock_scheduler_proxy)
@@ -108,7 +108,6 @@ class TestDiffCommand(AuroraClientCommandTest):
         patch('subprocess.call', return_value=0),
         patch('json.loads', return_value=Mock())) as (
             mock_scheduler_proxy_class,
-            mock_clusters,
             options,
             subprocess_patch,
             json_patch):
@@ -134,7 +133,6 @@ class TestDiffCommand(AuroraClientCommandTest):
         patch('subprocess.call', return_value=0),
         patch('json.loads', return_value=Mock())) as (
             mock_scheduler_proxy_class,
-            mock_clusters,
             options,
             subprocess_patch,
             json_patch):

http://git-wip-us.apache.org/repos/asf/aurora/blob/f9b60c6a/src/test/python/apache/aurora/client/cli/test_task.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/cli/test_task.py b/src/test/python/apache/aurora/client/cli/test_task.py
index abf6252..3ad0b70 100644
--- a/src/test/python/apache/aurora/client/cli/test_task.py
+++ b/src/test/python/apache/aurora/client/cli/test_task.py
@@ -77,8 +77,6 @@ class TestRunCommand(AuroraClientCommandTest):
             return_value=sandbox_args),
         patch('subprocess.Popen', return_value=self.create_mock_process())) as (
             mock_scheduler_proxy_class,
-            mock_clusters,
-            mock_clusters_cli,
             mock_runner_args_patch,
             mock_subprocess):
       cmd = AuroraCommandLine()
@@ -130,7 +128,6 @@ class TestSshCommand(AuroraClientCommandTest):
             return_value=sandbox_args),
         patch('subprocess.call', return_value=0)) as (
             mock_scheduler_proxy_class,
-            mock_clusters,
             mock_runner_args_patch,
             mock_subprocess):
       cmd = AuroraCommandLine()
@@ -156,7 +153,6 @@ class TestSshCommand(AuroraClientCommandTest):
         patch('apache.aurora.client.api.SchedulerProxy', return_value=mock_scheduler_proxy),
         patch('subprocess.call', return_value=0)) as (
             mock_scheduler_proxy_class,
-            mock_clusters,
             mock_subprocess):
       cmd = AuroraCommandLine()
       result = cmd.execute(['task', 'ssh', 'west/bozo/test/hello/1', '--command=ls'])

http://git-wip-us.apache.org/repos/asf/aurora/blob/f9b60c6a/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 5903101..1fbf050 100644
--- a/src/test/python/apache/aurora/client/cli/util.py
+++ b/src/test/python/apache/aurora/client/cli/util.py
@@ -127,7 +127,7 @@ class AuroraClientCommandTest(unittest.TestCase):
     # Since CLUSTERS is a global value that evaluates code on import this is the best way
to
     # ensure it does not pollute any tests.
     with CLUSTERS.patch(self.TEST_CLUSTERS._clusters.values()):
-      super(AuroraClientCommandTest, self).run()
+      super(AuroraClientCommandTest, self).run(result)
 
   @classmethod
   def create_blank_response(cls, code, msg):


Mime
View raw message