You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2014/11/03 14:16:24 UTC

git commit: AMBARI-8065 - Ambari-agent unit tests fail in branch-windows-dev

Repository: ambari
Updated Branches:
  refs/heads/branch-windows-dev e3277f9f4 -> 5fdb540eb


AMBARI-8065 - Ambari-agent unit tests fail in branch-windows-dev


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

Branch: refs/heads/branch-windows-dev
Commit: 5fdb540ebcdca82ae26f604ec4ddc3646f30dc7a
Parents: e3277f9
Author: Artem Baranchuk <ab...@hortonworks.com>
Authored: Mon Nov 3 14:06:15 2014 +0200
Committer: Artem Baranchuk <ab...@hortonworks.com>
Committed: Mon Nov 3 15:08:03 2014 +0200

----------------------------------------------------------------------
 .../src/main/python/ambari_agent/Controller.py  |  2 +-
 .../src/main/python/ambari_agent/NetUtil.py     |  5 +++--
 .../src/main/python/ambari_agent/main.py        | 15 ++++++++-----
 .../src/main/python/ambari_agent/shell.py       |  6 +++++
 .../src/test/python/ambari_agent/TestAlerts.py  |  2 +-
 .../test/python/ambari_agent/TestController.py  |  6 ++---
 .../TestCustomServiceOrchestrator.py            |  3 ++-
 .../src/test/python/ambari_agent/TestMain.py    | 23 +++++++++++---------
 .../src/test/python/ambari_agent/TestNetUtil.py | 13 ++++++-----
 9 files changed, 46 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/5fdb540e/ambari-agent/src/main/python/ambari_agent/Controller.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/ambari_agent/Controller.py b/ambari-agent/src/main/python/ambari_agent/Controller.py
index 53aaecd..f21100c 100644
--- a/ambari-agent/src/main/python/ambari_agent/Controller.py
+++ b/ambari-agent/src/main/python/ambari_agent/Controller.py
@@ -60,7 +60,7 @@ class Controller(threading.Thread):
         from HeartbeatHandlers_windows import HeartbeatStopHandler
       else:
         from HeartbeatStopHandler_linux import HeartbeatStopHandler
-      heartbeat_stop_callback = HeartbeatStopHandler
+      heartbeat_stop_callback = HeartbeatStopHandler()
 
     self.lock = threading.Lock()
     self.safeMode = True

http://git-wip-us.apache.org/repos/asf/ambari/blob/5fdb540e/ambari-agent/src/main/python/ambari_agent/NetUtil.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/ambari_agent/NetUtil.py b/ambari-agent/src/main/python/ambari_agent/NetUtil.py
index bfb48dc..79d5343 100644
--- a/ambari-agent/src/main/python/ambari_agent/NetUtil.py
+++ b/ambari-agent/src/main/python/ambari_agent/NetUtil.py
@@ -52,7 +52,7 @@ class NetUtil:
         from HeartbeatHandlers_windows import HeartbeatStopHandler
       else:
         from HeartbeatStopHandler_linux import HeartbeatStopHandler
-      stop_callback = HeartbeatStopHandler
+      stop_callback = HeartbeatStopHandler()
 
     self.stopCallback = stop_callback
 
@@ -113,6 +113,7 @@ class NetUtil:
 
       if 0 == self.stopCallback.wait(self.CONNECT_SERVER_RETRY_INTERVAL_SEC):
         #stop waiting
-        logger.info("Stop event received")
+        if logger is not None:
+          logger.info("Stop event received")
         self.DEBUG_STOP_RETRIES_FLAG = True
     return retries, connected

http://git-wip-us.apache.org/repos/asf/ambari/blob/5fdb540e/ambari-agent/src/main/python/ambari_agent/main.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/ambari_agent/main.py b/ambari-agent/src/main/python/ambari_agent/main.py
index 70d8157..5c258af 100644
--- a/ambari-agent/src/main/python/ambari_agent/main.py
+++ b/ambari-agent/src/main/python/ambari_agent/main.py
@@ -49,6 +49,8 @@ if IS_WINDOWS:
   from HeartbeatHandlers_windows import bind_signal_handlers
 else:
   from HeartbeatStopHandler_linux import bind_signal_handlers
+  from HeartbeatStopHandler_linux import signal_handler
+  from HeartbeatStopHandler_linux import debug
 
 def setup_logging(verbose):
   formatter = logging.Formatter(formatstr)
@@ -115,10 +117,10 @@ def perform_prestart_checks(expected_hostname):
       logger.error(msg)
       sys.exit(1)
   # Check if there is another instance running
-  # if os.path.isfile(ProcessHelper.pidfile):
-  #   print("%s already exists, exiting" % ProcessHelper.pidfile)
-  #   sys.exit(1)
-  # # check if ambari prefix exists
+  if os.path.isfile(ProcessHelper.pidfile) and not IS_WINDOWS:
+    print("%s already exists, exiting" % ProcessHelper.pidfile)
+    sys.exit(1)
+  # check if ambari prefix exists
   elif config.has_option('agent', 'prefix') and not os.path.isdir(os.path.abspath(config.get('agent', 'prefix'))):
     msg = "Ambari prefix dir %s does not exists, can't continue" \
           % config.get("agent", "prefix")
@@ -166,7 +168,7 @@ def stop_agent():
 
 # event - event, that will be passed to Controller and NetUtil to make able to interrupt loops form outside process
 # we need this for windows os, where no sigterm available
-def main(heartbeat_stop_callback):
+def main(heartbeat_stop_callback=None):
   global config
   parser = OptionParser()
   parser.add_option("-v", "--verbose", dest="verbose", action="store_true", help="verbose log output", default=False)
@@ -230,7 +232,8 @@ def main(heartbeat_stop_callback):
     controller = Controller(config, heartbeat_stop_callback)
     controller.start()
     controller.join()
-  #stop_agent()
+  if not IS_WINDOWS:
+    stop_agent()
   logger.info("finished")
 
 if __name__ == "__main__":

http://git-wip-us.apache.org/repos/asf/ambari/blob/5fdb540e/ambari-agent/src/main/python/ambari_agent/shell.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/ambari_agent/shell.py b/ambari-agent/src/main/python/ambari_agent/shell.py
index 201fee8..df6f0ca 100644
--- a/ambari-agent/src/main/python/ambari_agent/shell.py
+++ b/ambari-agent/src/main/python/ambari_agent/shell.py
@@ -172,6 +172,12 @@ def kill_process_with_children(parent_pid):
   else:
     _kill_process_with_children_linux(parent_pid)
 
+def changeUid():
+  if not platform.system() == "Windows":
+    try:
+      os.setuid(threadLocal.uid)
+    except Exception:
+      logger.warn("can not switch user for running command.")
 
 if platform.system() == "Windows":
   shellRunner = shellRunnerWindows

http://git-wip-us.apache.org/repos/asf/ambari/blob/5fdb540e/ambari-agent/src/test/python/ambari_agent/TestAlerts.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/test/python/ambari_agent/TestAlerts.py b/ambari-agent/src/test/python/ambari_agent/TestAlerts.py
index 160c5ce..7d04252 100644
--- a/ambari-agent/src/test/python/ambari_agent/TestAlerts.py
+++ b/ambari-agent/src/test/python/ambari_agent/TestAlerts.py
@@ -257,7 +257,7 @@ class TestAlerts(TestCase):
 
     res = pa.collect()
 
-    self.assertIsNotNone(collector.alerts()[0])
+    self.assertTrue(collector.alerts()[0] is not None)
     self.assertEquals('CRITICAL', collector.alerts()[0]['state'])
 
     collector.remove_by_uuid('c1f73191-4481-4435-8dae-fd380e4c0be1')

http://git-wip-us.apache.org/repos/asf/ambari/blob/5fdb540e/ambari-agent/src/test/python/ambari_agent/TestController.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/test/python/ambari_agent/TestController.py b/ambari-agent/src/test/python/ambari_agent/TestController.py
index 72b0cea..240d808 100644
--- a/ambari-agent/src/test/python/ambari_agent/TestController.py
+++ b/ambari-agent/src/test/python/ambari_agent/TestController.py
@@ -385,7 +385,7 @@ class TestController(unittest.TestCase):
 
     hearbeat = MagicMock()
     self.controller.heartbeat = hearbeat
-
+    event_mock.return_value = False
     dumpsMock.return_value = "data"
 
     sendRequest = MagicMock(name="sendRequest")
@@ -512,7 +512,7 @@ class TestController(unittest.TestCase):
     response["restartAgent"] = "false"
     self.controller.heartbeatWithServer()
 
-    sleepMock.assert_called_with(
+    event_mock.assert_any_call(timeout=
       self.controller.netutil.MINIMUM_INTERVAL_BETWEEN_HEARTBEATS)
 
     # Check that server continues to heartbeat after connection errors
@@ -533,7 +533,7 @@ class TestController(unittest.TestCase):
     self.controller.heartbeatWithServer()
     self.assertTrue(sendRequest.call_count > 5)
 
-    sleepMock.assert_called_with(
+    event_mock.assert_called_with(timeout=
       self.controller.netutil.MINIMUM_INTERVAL_BETWEEN_HEARTBEATS)
 
     sys.stdout = sys.__stdout__

http://git-wip-us.apache.org/repos/asf/ambari/blob/5fdb540e/ambari-agent/src/test/python/ambari_agent/TestCustomServiceOrchestrator.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/test/python/ambari_agent/TestCustomServiceOrchestrator.py b/ambari-agent/src/test/python/ambari_agent/TestCustomServiceOrchestrator.py
index 721cbe9..e37965b 100644
--- a/ambari-agent/src/test/python/ambari_agent/TestCustomServiceOrchestrator.py
+++ b/ambari-agent/src/test/python/ambari_agent/TestCustomServiceOrchestrator.py
@@ -95,7 +95,8 @@ class TestCustomServiceOrchestrator(TestCase):
       'clusterHostInfo':{'namenode_host' : ['1'],
                          'slave_hosts'   : ['0', '1'],
                          'all_hosts'     : ['h1.hortonworks.com', 'h2.hortonworks.com'],
-                         'all_ping_ports': ['8670:0,1']}
+                         'all_ping_ports': ['8670:0,1']},
+      'hostLevelParams':{}
     }
     
     decompress_cluster_host_info_mock.return_value = {'namenode_host' : ['h2.hortonworks.com'],

http://git-wip-us.apache.org/repos/asf/ambari/blob/5fdb540e/ambari-agent/src/test/python/ambari_agent/TestMain.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/test/python/ambari_agent/TestMain.py b/ambari-agent/src/test/python/ambari_agent/TestMain.py
index 7b1a8c8..9a75e2a 100644
--- a/ambari-agent/src/test/python/ambari_agent/TestMain.py
+++ b/ambari-agent/src/test/python/ambari_agent/TestMain.py
@@ -51,23 +51,22 @@ class TestMain(unittest.TestCase):
     sys.stdout = sys.__stdout__
 
 
+  @patch("ambari_agent.HeartbeatStopHandler_linux")
   @patch("os._exit")
   @patch("os.getpid")
   @patch.object(ProcessHelper, "stopAgent")
-  def test_signal_handler(self, stopAgent_mock, os_getpid_mock, os_exit_mock):
+  def test_signal_handler(self, stopAgent_mock, os_getpid_mock, os_exit_mock, heartbeat_handler_mock):
     # testing exit of children
     main.agentPid = 4444
     os_getpid_mock.return_value = 5555
     main.signal_handler("signum", "frame")
-    self.assertTrue(os_exit_mock.called)
-
+    heartbeat_handler_mock.set_stop.assert_called()
     os_exit_mock.reset_mock()
 
     # testing exit of main process
     os_getpid_mock.return_value = main.agentPid
     main.signal_handler("signum", "frame")
-    self.assertFalse(os_exit_mock.called)
-    self.assertTrue(stopAgent_mock.called)
+    heartbeat_handler_mock.set_stop.assert_called()
 
 
   @patch.object(main.logger, "addHandler")
@@ -121,7 +120,7 @@ class TestMain(unittest.TestCase):
 
   @patch("signal.signal")
   def test_bind_signal_handlers(self, signal_mock):
-    main.bind_signal_handlers()
+    main.bind_signal_handlers(os.getpid())
     # Check if on SIGINT/SIGTERM agent is configured to terminate
     signal_mock.assert_any_call(signal.SIGINT, main.signal_handler)
     signal_mock.assert_any_call(signal.SIGTERM, main.signal_handler)
@@ -230,7 +229,7 @@ class TestMain(unittest.TestCase):
   @patch.object(main, "setup_logging")
   @patch.object(main, "bind_signal_handlers")
   @patch.object(main, "stop_agent")
-  @patch.object(main, "resolve_ambari_config")
+  @patch.object(AmbariConfig, "getConfigFile")
   @patch.object(main, "perform_prestart_checks")
   @patch.object(main, "daemonize")
   @patch.object(main, "update_log_level")
@@ -246,21 +245,25 @@ class TestMain(unittest.TestCase):
   def test_main(self, ping_port_init_mock, ping_port_start_mock, data_clean_init_mock,data_clean_start_mock,
                 parse_args_mock, join_mock, start_mock, Controller_init_mock, try_to_connect_mock,
                 update_log_level_mock, daemonize_mock, perform_prestart_checks_mock,
-                resolve_ambari_config_mock, stop_mock, bind_signal_handlers_mock,
+                ambari_config_mock,
+                stop_mock, bind_signal_handlers_mock,
                 setup_logging_mock, socket_mock):
     data_clean_init_mock.return_value = None
     Controller_init_mock.return_value = None
     ping_port_init_mock.return_value = None
     options = MagicMock()
     parse_args_mock.return_value = (options, MagicMock)
-
+    try_to_connect_mock.return_value = (0, True)
+    # use default unix config
+    ambari_config_mock.return_value = os.path.abspath("../../../conf/unix/ambari-agent.ini")
     #testing call without command-line arguments
+
     main.main()
 
     self.assertTrue(setup_logging_mock.called)
     self.assertTrue(bind_signal_handlers_mock.called)
     self.assertTrue(stop_mock.called)
-    self.assertTrue(resolve_ambari_config_mock.called)
+    #self.assertTrue(resolve_ambari_config_mock.called)
     self.assertTrue(perform_prestart_checks_mock.called)
     self.assertTrue(daemonize_mock.called)
     self.assertTrue(update_log_level_mock.called)

http://git-wip-us.apache.org/repos/asf/ambari/blob/5fdb540e/ambari-agent/src/test/python/ambari_agent/TestNetUtil.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/test/python/ambari_agent/TestNetUtil.py b/ambari-agent/src/test/python/ambari_agent/TestNetUtil.py
index 474548f..255da88 100644
--- a/ambari-agent/src/test/python/ambari_agent/TestNetUtil.py
+++ b/ambari-agent/src/test/python/ambari_agent/TestNetUtil.py
@@ -21,6 +21,7 @@ limitations under the License.
 from ambari_agent import NetUtil
 from mock.mock import MagicMock, patch
 import unittest
+import threading
 
 class TestNetUtil(unittest.TestCase):
 
@@ -51,15 +52,17 @@ class TestNetUtil(unittest.TestCase):
 
 
   @patch("time.sleep")
-  def test_try_to_connect(self, sleepMock):
-
+  @patch.object(threading._Event, "wait")
+  def test_try_to_connect(self, event_mock,
+                            sleepMock):
+    event_mock.return_value = False
     netutil = NetUtil.NetUtil()
     checkURL = MagicMock(name="checkURL")
     checkURL.return_value = True, "test"
     netutil.checkURL = checkURL
 
     # one successful get
-    self.assertEqual(0, netutil.try_to_connect("url", 10))
+    self.assertEqual((0, True), netutil.try_to_connect("url", 10))
 
     # got successful after N retries
     gets = [[True, ""], [False, ""], [False, ""]]
@@ -67,9 +70,9 @@ class TestNetUtil(unittest.TestCase):
     def side_effect(*args):
       return gets.pop()
     checkURL.side_effect = side_effect
-    self.assertEqual(2, netutil.try_to_connect("url", 10))
+    self.assertEqual((2, True), netutil.try_to_connect("url", 10))
 
     # max retries
     checkURL.side_effect = None
     checkURL.return_value = False, "test"
-    self.assertEqual(5, netutil.try_to_connect("url", 5))
+    self.assertEqual((5,False), netutil.try_to_connect("url", 5))