Import patches-unapplied version 2.1.5-0ubuntu1 to ubuntu/yakkety-proposed

Imported using git-ubuntu import.

Changelog parent: 0f7cef5b52162d1ebb31a738bd8fc9febe1fbda6

New changelog entries:
  * New upstream release (LP: #1603581)
    - d/patches/disable-auto-update.patch:
      - The new version introduces auto-updating of the agent to its latest
        version via an internal mechanism; disable this
    - d/patches/fix_shebangs.patch:
      - Dropped in favour of the dh_python3 --shebang option.
    - Refreshed d/patches/disable_udev_overrides.patch

1 files changed, 65 insertions, 0 deletions

diff --git a/tests/daemon/test_daemon.py b/tests/daemon/test_daemon.py
new file mode 100644
index 0000000..263af49
--- /dev/null
+++ b/tests/daemon/test_daemon.py
@@ -0,0 +1,65 @@
+# Copyright 2014 Microsoft Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Requires Python 2.4+ and Openssl 1.0+
+#
+
+from tests.tools import *
+from azurelinuxagent.common.exception import *
+from azurelinuxagent.daemon import *
+
+class MockDaemonCall(object):
+    def __init__(self, daemon_handler, count):
+        self.daemon_handler = daemon_handler
+        self.count = count
+
+    def __call__(self, *args, **kw):
+        self.count = self.count - 1
+        #Stop daemon after restarting for n times
+        if self.count <= 0:
+            self.daemon_handler.running = False
+        raise Exception("Mock unhandled exception")
+
+@patch("time.sleep")
+class TestDaemon(AgentTestCase):
+    def test_daemon_restart(self, mock_sleep):
+        #Mock daemon function
+        daemon_handler = get_daemon_handler()
+        mock_daemon = Mock(side_effect=MockDaemonCall(daemon_handler, 2))
+        daemon_handler.daemon = mock_daemon
+
+        daemon_handler.check_pid = Mock()
+ 
+        daemon_handler.run()
+
+        mock_sleep.assert_any_call(15)
+        self.assertEquals(2, daemon_handler.daemon.call_count)
+
+    @patch("azurelinuxagent.daemon.main.conf")
+    @patch("azurelinuxagent.daemon.main.sys.exit")
+    def test_check_pid(self, mock_exit, mock_conf, mock_sleep):
+        daemon_handler = get_daemon_handler()
+
+        mock_pid_file = os.path.join(self.tmp_dir, "pid")
+        mock_conf.get_agent_pid_file_path = Mock(return_value=mock_pid_file)
+
+        daemon_handler.check_pid()
+        self.assertTrue(os.path.isfile(mock_pid_file))
+
+        daemon_handler.check_pid()
+        mock_exit.assert_any_call(0)
+   
+if __name__ == '__main__':
+    unittest.main()
+