ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject [1/2] ambari git commit: AMBARI-13789. Fix unit tests failures on Mac (aonishuk)
Date Mon, 09 Nov 2015 13:15:43 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 aaeac45b9 -> 4e4112423
  refs/heads/trunk 48ad32a20 -> 18a25ce13


AMBARI-13789. Fix unit tests failures on Mac (aonishuk)


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

Branch: refs/heads/trunk
Commit: 18a25ce13108d3ef0de857a3db412ebb7a559ea6
Parents: 48ad32a
Author: Andrew Onishuk <aonishuk@hortonworks.com>
Authored: Mon Nov 9 15:15:31 2015 +0200
Committer: Andrew Onishuk <aonishuk@hortonworks.com>
Committed: Mon Nov 9 15:15:31 2015 +0200

----------------------------------------------------------------------
 ambari-server/src/test/python/stacks/utils/RMFTestCase.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/18a25ce1/ambari-server/src/test/python/stacks/utils/RMFTestCase.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/utils/RMFTestCase.py b/ambari-server/src/test/python/stacks/utils/RMFTestCase.py
index 0420161..ca32649 100644
--- a/ambari-server/src/test/python/stacks/utils/RMFTestCase.py
+++ b/ambari-server/src/test/python/stacks/utils/RMFTestCase.py
@@ -113,12 +113,11 @@ class RMFTestCase(TestCase):
     try:
       with patch.object(platform, 'linux_distribution', return_value=os_type):
         script_module = imp.load_source(classname, script_path)
+        script_class_inst = RMFTestCase._get_attr(script_module, classname)()
+        method = RMFTestCase._get_attr(script_class_inst, command)
     except IOError, err:
       raise RuntimeError("Cannot load class %s from %s: %s" % (classname, norm_path, err.message))
     
-    script_class_inst = RMFTestCase._get_attr(script_module, classname)()
-    method = RMFTestCase._get_attr(script_class_inst, command)
-    
     # Reload params import, otherwise it won't change properties during next import
     if 'params' in sys.modules:  
       del(sys.modules["params"])


Mime
View raw message