Merge ~ltrager/maas:lp1801152 into maas:master

[Lee Trager]

LP: #1801152 - Ensure 99-maas-02-capture-lldp never sleeps longer than 60s.

Drive by cleanup I missed when fixing LP:1800233 - Remove Trusty support from LLDPD test

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp1801152 lp:~ltrager/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 84a0798834f0a09ada5712c633f88a207078b8fd

review: Approve

1ec9e08... by Lee Trager on 2018-11-02

Use min

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp1801152 lp:~ltrager/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 1ec9e085478de32b65058ea4a2767229f41a2c59

review: Approve

[Blake Rouse (blake-rouse)]

Looks good

review: Approve

diff --git a/src/provisioningserver/refresh/node_info_scripts.py b/src/provisioningserver/refresh/node_info_scripts.py
index 6d0ab94..bcda1c5 100644
--- a/src/provisioningserver/refresh/node_info_scripts.py
+++ b/src/provisioningserver/refresh/node_info_scripts.py
@@ -373,22 +373,13 @@ def lldpd_install(config_file):
     node's temporary presence.
 
     """
-    import os
     from subprocess import check_call
     from codecs import open
     with open(config_file, "a", "ascii") as fd:
         fd.write('\n')  # Ensure there's a newline.
         fd.write('# Configured by MAAS:\n')
         fd.write('DAEMON_ARGS="-c -f -s -e -r"\n')
-    if os.path.isdir("/run/systemd/system"):
-        check_call(("systemctl", "restart", "lldpd"))
-    else:
-        # Reload initctl configuration in order to make sure that the
-        # lldpd init script is available before restart, otherwise
-        # it might cause gathering node info to fail. This is due bug
-        # (LP: #882147) in the kernel.
-        check_call(("initctl", "reload-configuration"))
-        check_call(("service", "lldpd", "restart"))
+    check_call(('systemctl', 'restart', 'lldpd'))
 
 
 # This function must be entirely self-contained. It must not use
@@ -406,7 +397,11 @@ def lldpd_capture(reference_file, time_delay):
     time_ref = getmtime(reference_file)
     time_remaining = time_ref + time_delay - time()
     if time_remaining > 0:
-        sleep(time_remaining)
+        # LP:1801152 - If the hardware clock is in the future when
+        # 00-maas-03-install-lldpd runs and NTP corrects the clock
+        # before this script runs time_remaining will be more then
+        # the time_delay which may cause this script to timeout.
+        sleep(min(time_remaining, time_delay))
     check_call(("lldpctl", "-f", "xml"))
 
 
diff --git a/src/provisioningserver/refresh/tests/test_node_info_scripts.py b/src/provisioningserver/refresh/tests/test_node_info_scripts.py
index 8b6102d..a4941c6 100644
--- a/src/provisioningserver/refresh/tests/test_node_info_scripts.py
+++ b/src/provisioningserver/refresh/tests/test_node_info_scripts.py
@@ -127,31 +127,6 @@ def isolate_function(function, namespace=None):
 
 class TestLLDPScripts(MAASTestCase):
 
-    def test_install_script_installs_configures_and_restarts_upstart(self):
-        config_file = self.make_file("config", "# ...")
-        check_call = self.patch(subprocess, "check_call")
-        self.patch(os.path, "isdir").return_value = False
-        lldpd_install = isolate_function(node_info_module.lldpd_install)
-        lldpd_install(config_file)
-        # lldpd is installed and restarted.
-        self.assertEqual(
-            check_call.call_args_list,
-            [
-                call(("initctl", "reload-configuration")),
-                call(("service", "lldpd", "restart"))
-            ])
-        # lldpd's config was updated to include an updated DAEMON_ARGS
-        # setting. Note that the new comment is on a new line, and
-        # does not interfere with existing config.
-        config_expected = dedent("""\
-            # ...
-            # Configured by MAAS:
-            DAEMON_ARGS="-c -f -s -e -r"
-            """).encode("ascii")
-        with open(config_file, "rb") as fd:
-            config_observed = fd.read()
-        self.assertEqual(config_expected, config_observed)
-
     def test_install_script_installs_configures_and_restarts_systemd(self):
         config_file = self.make_file("config", "# ...")
         check_call = self.patch(subprocess, "check_call")
@@ -200,6 +175,19 @@ class TestLLDPScripts(MAASTestCase):
             os.path.getmtime.return_value + time_delay -
             time.time.return_value))
 
+    def test_capture_lldpd_script_doesnt_waits_for_more_than_sixty_secs(self):
+        # Regression test for LP:1801152
+        reference_file = self.make_file("reference")
+        lldpd_capture = isolate_function(node_info_module.lldpd_capture)
+        self.patch(os.path, "getmtime").return_value = 1000.1
+        self.patch(time, "time").return_value = 10.25
+        self.patch(time, "sleep")
+        self.patch(subprocess, "check_call")
+
+        lldpd_capture(reference_file, 60)
+
+        self.assertThat(time.sleep, MockCalledOnceWith(60))
+
     def test_capture_lldpd_calls_lldpdctl(self):
         reference_file = self.make_file("reference")
         check_call = self.patch(subprocess, "check_call")