aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject git commit: Updated test to use environment variable if it exits.
Date Fri, 28 Feb 2014 00:51:00 GMT
Repository: incubator-aurora
Updated Branches:
  refs/heads/master ccc6694f3 -> c428f4c9b


Updated test to use environment variable if it exits.

Testing Done:
./build-support/jenkins/build.sh runs successfully

Bugs closed: AURORA-101

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


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

Branch: refs/heads/master
Commit: c428f4c9b97438c4c6079b56719038da6e403b7f
Parents: ccc6694
Author: Suman Karumuri <mansu@apache.org>
Authored: Thu Feb 27 16:50:11 2014 -0800
Committer: Suman Karumuri <skarumuri@twitter.com>
Committed: Thu Feb 27 16:50:11 2014 -0800

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


http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/c428f4c9/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 9c23a60..758b37e 100644
--- a/src/test/python/apache/aurora/client/cli/test_diff.py
+++ b/src/test/python/apache/aurora/client/cli/test_diff.py
@@ -15,6 +15,7 @@
 #
 
 import contextlib
+import os
 
 from apache.aurora.client.cli import (
     EXIT_INVALID_CONFIGURATION,
@@ -134,7 +135,7 @@ class TestDiffCommand(AuroraClientCommandTest):
         # Subprocess should have been used to invoke diff with two parameters.
         assert subprocess_patch.call_count == 1
         assert len(subprocess_patch.call_args[0][0]) == 3
-        assert subprocess_patch.call_args[0][0][0] == 'diff'
+        assert subprocess_patch.call_args[0][0][0] == os.environ.get('DIFF_VIEWER', 'diff')
 
   def test_diff_invalid_config(self):
     """Test the diff command if the user passes a config with an error in it."""

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/c428f4c9/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 339459e..730f802 100644
--- a/src/test/python/apache/aurora/client/commands/test_diff.py
+++ b/src/test/python/apache/aurora/client/commands/test_diff.py
@@ -15,6 +15,7 @@
 #
 
 import contextlib
+import os
 
 from apache.aurora.client.commands.core import diff
 from apache.aurora.client.commands.util import AuroraClientCommandTest
@@ -137,7 +138,7 @@ class TestDiffCommand(AuroraClientCommandTest):
         # Subprocess should have been used to invoke diff with two parameters.
         assert subprocess_patch.call_count == 1
         assert len(subprocess_patch.call_args[0][0]) == 3
-        assert subprocess_patch.call_args[0][0][0] == 'diff'
+        assert subprocess_patch.call_args[0][0][0] == os.environ.get('DIFF_VIEWER', 'diff')
 
   def test_diff_invalid_config(self):
     """Test the diff command if the user passes a config with an error in it."""


Mime
View raw message