ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject git commit: AMBARI-4598. Unittest failures on ambari-server machine (Iryna Kuzmenko via aonishuk)
Date Tue, 11 Feb 2014 12:49:09 GMT
Updated Branches:
  refs/heads/trunk 7bb9b47d7 -> 072c625e9


AMBARI-4598. Unittest failures on ambari-server machine (Iryna Kuzmenko
via aonishuk)


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

Branch: refs/heads/trunk
Commit: 072c625e9292c5f0906f76658551deb6d8eb3f0a
Parents: 7bb9b47
Author: Andrew Onischuk <aonishuk@hortonworks.com>
Authored: Tue Feb 11 04:47:37 2014 -0800
Committer: Andrew Onischuk <aonishuk@hortonworks.com>
Committed: Tue Feb 11 04:47:37 2014 -0800

----------------------------------------------------------------------
 ambari-server/src/test/python/TestAmbariServer.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/072c625e/ambari-server/src/test/python/TestAmbariServer.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/TestAmbariServer.py b/ambari-server/src/test/python/TestAmbariServer.py
index 205ece7..b473031 100644
--- a/ambari-server/src/test/python/TestAmbariServer.py
+++ b/ambari-server/src/test/python/TestAmbariServer.py
@@ -2409,7 +2409,8 @@ MIIFHjCCAwYCCQDpHKOBI+Lt0zANBgkqhkiG9w0BAQUFADBRMQswCQYDVQQGEwJV
   @patch.object(ambari_server, "parse_properties_file")
   @patch.object(ambari_server, "is_root")
   @patch.object(ambari_server, "check_database_name_property")
-  def test_silent_reset(self, check_database_name_property_mock, is_root_mock, parse_properties_file_mock,
+  @patch.object(ambari_server, 'is_server_runing')
+  def test_silent_reset(self, is_server_runing_mock, check_database_name_property_mock, is_root_mock,
parse_properties_file_mock,
                         run_os_command_mock, print_info_msg_mock,
                         setup_db_mock):
     is_root_mock.return_value = True
@@ -2419,6 +2420,7 @@ MIIFHjCCAwYCCQDpHKOBI+Lt0zANBgkqhkiG9w0BAQUFADBRMQswCQYDVQQGEwJV
     self.assertTrue(ambari_server.SILENT)
     setup_db_mock.return_value = (0, None, None)
     run_os_command_mock.return_value = (0, None, None)
+    is_server_runing_mock.return_value = (False, 0)
 
     def signal_handler(signum, frame):
       self.fail("Timed out!")
@@ -3413,7 +3415,8 @@ MIIFHjCCAwYCCQDpHKOBI+Lt0zANBgkqhkiG9w0BAQUFADBRMQswCQYDVQQGEwJV
   @patch.object(ambari_server, "run_os_command")
   @patch.object(ambari_server, "is_root")
   @patch.object(ambari_server, "check_database_name_property")
-  def test_reset_remote_db_wo_client(self, check_database_name_property_mock, is_root_mock,
run_os_command_mock,
+  @patch.object(ambari_server, 'is_server_runing')
+  def test_reset_remote_db_wo_client(self, is_server_runing_mock, check_database_name_property_mock,
is_root_mock, run_os_command_mock,
                                      setup_db_mock,
                                      get_YN_inputMock, print_error_msg_mock, get_db_cli_tool_mock,
                                      parse_properties_file_mock):
@@ -3423,6 +3426,7 @@ MIIFHjCCAwYCCQDpHKOBI+Lt0zANBgkqhkiG9w0BAQUFADBRMQswCQYDVQQGEwJV
     args.persistence_type = "remote"
     get_db_cli_tool_mock.return_value = None
     is_root_mock.return_value = True
+    is_server_runing_mock.return_value = (False, 0)
     try:
       ambari_server.reset(args)
       self.fail("Should throw exception")


Mime
View raw message