Merge lp:~ericsnowcurrently/landscape-client/fix-test-race-sys-argv into lp:~landscape/landscape-client/trunk

[Eric Snow]

his patch fixes a race condition in tests involving sys.argv.

Under certain load conditions there is a collision on patched-out
sys.argv. To resolve this, we switch to using the config to store the
bindir that should be used (rather than extrapolating from sys.argv[0]).

This patch fixes a race condition in tests involving sys.argv.

Under certain load conditions there is a collision on patched-out
sys.argv. To resolve this, we switch to using the config to store the
bindir that should be used (rather than extrapolating from sys.argv[0]).

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: TRIAL_ARGS=-j4 make ci-check
Result: Fail
Revno: 992
Branch: lp:~ericsnowcurrently/landscape-client/fix-test-race-sys-argv
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3818/

review: Needs Fixing (test results)

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-check
Result: Success
Revno: 992
Branch: lp:~ericsnowcurrently/landscape-client/fix-test-race-sys-argv
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3830/

review: Approve (test results)

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-check
Result: Success
Revno: 993
Branch: lp:~ericsnowcurrently/landscape-client/fix-test-race-sys-argv
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3831/

review: Approve (test results)

[Simon Poirier (simpoir)]

+1 looks good. few nitpicks.

review: Approve

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-check
Result: Success
Revno: 996
Branch: lp:~ericsnowcurrently/landscape-client/fix-test-race-sys-argv
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3832/

review: Approve (test results)

[Free Ekanayaka (free.ekanayaka)]

+1

review: Approve

[🤖 Landscape Builder (landscape-builder)]

Attempt to merge into lp:landscape-client failed due to conflicts:

text conflict in landscape/manager/packagemanager.py
text conflict in landscape/watchdog.py

[lp:~ericsnowcurrently/landscape-client/fix-test-race-sys-argv]

997. By Eric Snow on 2017-04-05

Merge from trunk.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-check
Result: Success
Revno: 997
Branch: lp:~ericsnowcurrently/landscape-client/fix-test-race-sys-argv
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3842/

review: Approve (test results)

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-check
Result: Success
Revno: 997
Branch: lp:~ericsnowcurrently/landscape-client/fix-test-race-sys-argv
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3843/

review: Approve (test results)

=== modified file 'landscape/deployment.py'
--- landscape/deployment.py	2017-01-09 16:38:21 +0000
+++ landscape/deployment.py	2017-04-05 14:19:44 +0000
@@ -1,4 +1,5 @@
 import os
+import os.path
 import sys
 
 from configobj import ConfigObj, ConfigObjError
@@ -432,3 +433,18 @@
         upgrade_manager.initialize(persist)
     persist.save(service.persist_filename)
     return persist
+
+
+def get_bindir(config=None):
+    """Return the directory path where the client binaries are.
+
+    If the config is None, it doesn't have a "bindir" attribute, or its
+    value is None, then sys.argv[0] is returned.
+    """
+    try:
+        bindir = config.bindir
+    except AttributeError:  # ...also the result if config is None.
+        bindir = None
+    if bindir is None:
+        bindir = os.path.dirname(os.path.abspath(sys.argv[0]))
+    return bindir

=== modified file 'landscape/lib/bpickle.py'
--- landscape/lib/bpickle.py	2017-04-03 08:15:02 +0000
+++ landscape/lib/bpickle.py	2017-04-05 14:19:44 +0000
@@ -210,4 +210,3 @@
     dumps_table.update({
         str: dumps_unicode,
     })
-

=== modified file 'landscape/lib/tests/test_process.py'
--- landscape/lib/tests/test_process.py	2017-03-29 09:15:01 +0000
+++ landscape/lib/tests/test_process.py	2017-04-05 14:19:44 +0000
@@ -43,7 +43,8 @@
     @mock.patch("landscape.lib.process.detect_jiffies", return_value=1)
     @mock.patch("os.listdir")
     @mock.patch("landscape.monitor.computeruptime.get_uptime")
-    def test_missing_process_race(self, get_uptime_mock, list_dir_mock, jiffies_mock):
+    def test_missing_process_race(self, get_uptime_mock, list_dir_mock,
+                                  jiffies_mock):
         """
         We use os.listdir("/proc") to get the list of active processes, if a
         process ends before we attempt to read the process' information, then

=== modified file 'landscape/manager/aptsources.py'
--- landscape/manager/aptsources.py	2017-03-28 14:09:52 +0000
+++ landscape/manager/aptsources.py	2017-04-05 14:19:44 +0000
@@ -135,7 +135,7 @@
 
     def _run_reporter(self):
         """Once the repositories are modified, trigger a reporter run."""
-        reporter = find_reporter_command()
+        reporter = find_reporter_command(self.registry.config)
 
         # Force an apt-update run, because the sources.list has changed
         args = ["--force-apt-update"]

=== modified file 'landscape/manager/packagemanager.py'
--- landscape/manager/packagemanager.py	2017-04-04 08:50:05 +0000
+++ landscape/manager/packagemanager.py	2017-04-05 14:19:44 +0000
@@ -69,13 +69,12 @@
         if self.config.config:
             args.extend(["-c", self.config.config])
         if self._package_store.get_next_task(cls.queue_name):
+            command = cls.find_command(self.config)
+            environ = encode_values(os.environ)
             # path is set to None so that getProcessOutput does not
             # chdir to "." see bug #211373
-            environ = encode_values(os.environ)
-            result = getProcessOutput(cls.find_command(),
-                                      args=args, env=environ,
-                                      errortoo=1,
-                                      path=None)
+            result = getProcessOutput(
+                command, args=args, env=environ, errortoo=1, path=None)
             result.addCallback(self._got_output, cls)
         else:
             result = succeed(None)

=== modified file 'landscape/manager/tests/test_aptsources.py'
--- landscape/manager/tests/test_aptsources.py	2017-04-05 07:25:48 +0000
+++ landscape/manager/tests/test_aptsources.py	2017-04-05 14:19:44 +0000
@@ -3,7 +3,6 @@
 import mock
 
 from twisted.internet.defer import Deferred, succeed
-from twisted.python.compat import _PY3
 
 from landscape.manager.aptsources import AptSources
 from landscape.manager.plugin import SUCCEEDED, FAILED
@@ -469,7 +468,8 @@
         deferred = Deferred()
 
         def _run_process(command, args, env={}, path=None, uid=None, gid=None):
-            self.assertEqual(find_reporter_command(), command)
+            self.assertEqual(
+                find_reporter_command(self.manager.config), command)
             self.assertEqual(["--force-apt-update", "--config=%s" %
                               self.manager.config.config], args)
             deferred.callback(("ok", "", 0))

=== modified file 'landscape/manager/tests/test_packagemanager.py'
--- landscape/manager/tests/test_packagemanager.py	2017-01-09 14:29:54 +0000
+++ landscape/manager/tests/test_packagemanager.py	2017-04-05 14:19:44 +0000
@@ -1,5 +1,6 @@
 import mock
 import os
+import os.path
 
 from twisted.internet.defer import Deferred
 
@@ -20,6 +21,7 @@
     def setUp(self):
         """Initialize test helpers and create a sample package store."""
         super(PackageManagerTest, self).setUp()
+        self.config = self.broker_service.config
         self.package_store = PackageStore(os.path.join(self.data_path,
                                                        "package/database"))
         self.package_manager = PackageManager()
@@ -29,8 +31,7 @@
         If the package sqlite database file doesn't exist yet, it is created
         upon message handling.
         """
-        filename = os.path.join(self.broker_service.config.data_path,
-                                "package/database")
+        filename = os.path.join(self.config.data_path, "package/database")
         os.unlink(filename)
         self.assertFalse(os.path.isfile(filename))
 
@@ -179,21 +180,21 @@
             self.package_manager.spawn_handler.assert_called_once_with(
                 ReleaseUpgrader)
 
-    @mock.patch("landscape.package.changer.find_changer_command")
-    def test_spawn_changer(self, find_command_mock):
+    def test_spawn_changer(self):
         """
         The L{PackageManager.spawn_handler} method executes the correct command
         when passed the L{PackageChanger} class as argument.
         """
-        command = self.makeFile("#!/bin/sh\necho 'I am the changer!' >&2\n")
-        os.chmod(command, 0o755)
-        find_command_mock.return_value = command
+        command = self.write_script(
+            self.config,
+            "landscape-package-changer",
+            "#!/bin/sh\necho 'I am the changer!' >&2\n")
+        self.manager.config = self.config
 
         self.package_store.add_task("changer", "Do something!")
 
         self.manager.add(self.package_manager)
         result = self.package_manager.spawn_handler(PackageChanger)
-        find_command_mock.assert_called_once_with()
 
         def got_result(result):
             log = self.logfile.getvalue()
@@ -202,21 +203,20 @@
 
         return result.addCallback(got_result)
 
-    @mock.patch(
-        "landscape.package.releaseupgrader.find_release_upgrader_command")
-    def test_spawn_release_upgrader(self, find_command_mock):
+    def test_spawn_release_upgrader(self):
         """
         The L{PackageManager.spawn_handler} method executes the correct command
         when passed the L{ReleaseUpgrader} class as argument.
         """
-        command = self.makeFile("#!/bin/sh\necho 'I am the upgrader!' >&2\n")
-        os.chmod(command, 0o755)
-        find_command_mock.return_value = command
+        command = self.write_script(
+            self.config,
+            "landscape-release-upgrader",
+            "#!/bin/sh\necho 'I am the upgrader!' >&2\n")
+        self.manager.config = self.config
 
         self.package_store.add_task("release-upgrader", "Do something!")
         self.manager.add(self.package_manager)
         result = self.package_manager.spawn_handler(ReleaseUpgrader)
-        find_command_mock.assert_called_once_with()
 
         def got_result(result):
             log = self.logfile.getvalue()
@@ -225,15 +225,17 @@
 
         return result.addCallback(got_result)
 
-    @mock.patch("landscape.package.changer.find_changer_command")
-    def test_spawn_handler_without_output(self, find_command_mock):
-        find_command_mock.return_value = "/bin/true"
+    def test_spawn_handler_without_output(self):
+        self.write_script(
+            self.config,
+            "landscape-package-changer",
+            "#!/bin/sh\n/bin/true")
+        self.manager.config = self.config
 
         self.package_store.add_task("changer", "Do something!")
 
         self.manager.add(self.package_manager)
         result = self.package_manager.spawn_handler(PackageChanger)
-        find_command_mock.assert_called_once_with()
 
         def got_result(result):
             log = self.logfile.getvalue()
@@ -241,18 +243,18 @@
 
         return result.addCallback(got_result)
 
-    @mock.patch("landscape.package.changer.find_changer_command")
-    def test_spawn_handler_copies_environment(self, find_command_mock):
-        command = self.makeFile("#!/bin/sh\necho VAR: $VAR\n")
-        os.chmod(command, 0o755)
-        find_command_mock.return_value = command
+    def test_spawn_handler_copies_environment(self):
+        command = self.write_script(
+            self.config,
+            "landscape-package-changer",
+            "#!/bin/sh\necho VAR: $VAR\n")
+        self.manager.config = self.config
 
         self.manager.add(self.package_manager)
         self.package_store.add_task("changer", "Do something!")
 
         os.environ["VAR"] = "HI!"
         result = self.package_manager.spawn_handler(PackageChanger)
-        find_command_mock.assert_called_once_with()
 
         def got_result(result):
             log = self.logfile.getvalue()
@@ -261,16 +263,16 @@
 
         return result.addCallback(got_result)
 
-    @mock.patch("landscape.package.changer.find_changer_command")
-    def test_spawn_handler_passes_quiet_option(self, find_command_mock):
-        command = self.makeFile("#!/bin/sh\necho OPTIONS: $@\n")
-        os.chmod(command, 0o755)
-        find_command_mock.return_value = command
+    def test_spawn_handler_passes_quiet_option(self):
+        command = self.write_script(
+            self.config,
+            "landscape-package-changer",
+            "#!/bin/sh\necho OPTIONS: $@\n")
+        self.manager.config = self.config
 
         self.manager.add(self.package_manager)
         self.package_store.add_task("changer", "Do something!")
         result = self.package_manager.spawn_handler(PackageChanger)
-        find_command_mock.assert_called_once_with()
 
         def got_result(result):
             log = self.logfile.getvalue()
@@ -292,22 +294,22 @@
 
         return result.addCallback(got_result)
 
-    @mock.patch("landscape.package.changer.find_changer_command")
-    def test_spawn_handler_doesnt_chdir(self, find_command_mock):
-        command = self.makeFile("#!/bin/sh\necho RUN\n")
-        os.chmod(command, 0o755)
+    def test_spawn_handler_doesnt_chdir(self):
+        self.write_script(
+            self.config,
+            "landscape-package-changer",
+            "#!/bin/sh\necho RUN\n")
+        self.manager.config = self.config
+
         cwd = os.getcwd()
         self.addCleanup(os.chdir, cwd)
         dir = self.makeDir()
         os.chdir(dir)
         os.chmod(dir, 0)
 
-        find_command_mock.return_value = command
-
         self.manager.add(self.package_manager)
         self.package_store.add_task("changer", "Do something!")
         result = self.package_manager.spawn_handler(PackageChanger)
-        find_command_mock.assert_called_once_with()
 
         def got_result(result):
             log = self.logfile.getvalue()

=== modified file 'landscape/monitor/packagemonitor.py'
--- landscape/monitor/packagemonitor.py	2017-04-04 08:50:05 +0000
+++ landscape/monitor/packagemonitor.py	2017-04-05 14:19:44 +0000
@@ -14,13 +14,14 @@
     run_interval = 1800
     scope = "package"
 
+    _reporter_command = None
+
     def __init__(self, package_store_filename=None):
         super(PackageMonitor, self).__init__()
         if package_store_filename:
             self._package_store = PackageStore(package_store_filename)
         else:
             self._package_store = None
-        self._reporter_command = find_reporter_command()
 
     def register(self, registry):
         self.config = registry.config
@@ -117,6 +118,8 @@
             else:
                 env["FAKE_GLOBAL_PACKAGE_STORE"] = "1"
 
+        if self._reporter_command is None:
+            self._reporter_command = find_reporter_command(self.config)
         # path is set to None so that getProcessOutput does not
         # chdir to "." see bug #211373
         env = encode_values(env)

=== modified file 'landscape/monitor/tests/test_packagemonitor.py'
--- landscape/monitor/tests/test_packagemonitor.py	2017-03-30 07:57:04 +0000
+++ landscape/monitor/tests/test_packagemonitor.py	2017-04-05 14:19:44 +0000
@@ -129,12 +129,10 @@
         self.assertEqual(task.data, message)
 
     def test_spawn_reporter(self):
-        command = self.makeFile("#!/bin/sh\necho 'I am the reporter!' >&2\n")
-        os.chmod(command, 0o755)
-        find_command_mock_patcher = mock.patch(
-            "landscape.monitor.packagemonitor.find_reporter_command",
-            return_value=command)
-        find_command_mock_patcher.start()
+        command = self.write_script(
+            self.config,
+            "landscape-package-reporter",
+            "#!/bin/sh\necho 'I am the reporter!' >&2\n")
 
         package_monitor = PackageMonitor(self.package_store_filename)
         self.monitor.add(package_monitor)
@@ -144,15 +142,14 @@
             log = self.logfile.getvalue()
             self.assertIn("I am the reporter!", log)
             self.assertNotIn(command, log)
-            find_command_mock_patcher.stop()
 
         return result.addCallback(got_result)
 
     def test_spawn_reporter_without_output(self):
-        find_command_mock_patcher = mock.patch(
-            "landscape.monitor.packagemonitor.find_reporter_command",
-            return_value="/bin/true")
-        find_command_mock_patcher.start()
+        self.write_script(
+            self.config,
+            "landscape-package-reporter",
+            "#!/bin/sh\n/bin/true")
 
         package_monitor = PackageMonitor(self.package_store_filename)
         self.monitor.add(package_monitor)
@@ -161,17 +158,14 @@
         def got_result(result):
             log = self.logfile.getvalue()
             self.assertNotIn("reporter output", log)
-            find_command_mock_patcher.stop()
 
         return result.addCallback(got_result)
 
     def test_spawn_reporter_copies_environment(self):
-        command = self.makeFile("#!/bin/sh\necho VAR: $VAR\n")
-        os.chmod(command, 0o755)
-        find_command_mock_patcher = mock.patch(
-            "landscape.monitor.packagemonitor.find_reporter_command",
-            return_value=command)
-        find_command_mock_patcher.start()
+        command = self.write_script(
+            self.config,
+            "landscape-package-reporter",
+            "#!/bin/sh\necho VAR: $VAR\n")
 
         package_monitor = PackageMonitor(self.package_store_filename)
         self.monitor.add(package_monitor)
@@ -184,17 +178,14 @@
             log = self.logfile.getvalue()
             self.assertIn("VAR: HI!", log)
             self.assertNotIn(command, log)
-            find_command_mock_patcher.stop()
 
         return result.addCallback(got_result)
 
     def test_spawn_reporter_passes_quiet_option(self):
-        command = self.makeFile("#!/bin/sh\necho OPTIONS: $@\n")
-        os.chmod(command, 0o755)
-        find_command_mock_patcher = mock.patch(
-            "landscape.monitor.packagemonitor.find_reporter_command",
-            return_value=command)
-        find_command_mock_patcher.start()
+        command = self.write_script(
+            self.config,
+            "landscape-package-reporter",
+            "#!/bin/sh\necho OPTIONS: $@\n")
 
         package_monitor = PackageMonitor(self.package_store_filename)
         self.monitor.add(package_monitor)
@@ -205,7 +196,6 @@
             log = self.logfile.getvalue()
             self.assertIn("OPTIONS: --quiet", log)
             self.assertNotIn(command, log)
-            find_command_mock_patcher.stop()
 
         return result.addCallback(got_result)
 
@@ -276,19 +266,16 @@
         self.assertSingleReporterTask(task.data, task.id)
 
     def test_spawn_reporter_doesnt_chdir(self):
-        command = self.makeFile("#!/bin/sh\necho RUN\n")
-        os.chmod(command, 0o755)
+        self.write_script(
+            self.config,
+            "landscape-package-reporter",
+            "#!/bin/sh\necho RUN\n")
         cwd = os.getcwd()
         self.addCleanup(os.chdir, cwd)
         dir = self.makeDir()
         os.chdir(dir)
         os.chmod(dir, 0)
 
-        find_command_mock_patcher = mock.patch(
-            "landscape.monitor.packagemonitor.find_reporter_command",
-            return_value=command)
-        find_command_mock_patcher.start()
-
         package_monitor = PackageMonitor(self.package_store_filename)
         self.monitor.add(package_monitor)
 
@@ -299,7 +286,6 @@
             self.assertIn("RUN", log)
             # restore permissions to the dir so tearDown can clean it up
             os.chmod(dir, 0o766)
-            find_command_mock_patcher.stop()
 
         return result.addCallback(got_result)
 

=== modified file 'landscape/monitor/tests/test_processorinfo.py'
--- landscape/monitor/tests/test_processorinfo.py	2017-03-30 08:53:45 +0000
+++ landscape/monitor/tests/test_processorinfo.py	2017-04-05 14:19:44 +0000
@@ -389,7 +389,7 @@
 processor 1: version = FF,  identification = 018F67,  machine = 2964
 processor 2: version = FF,  identification = 018F67,  machine = 2964
 processor 3: version = FF,  identification = 018F67,  machine = 2964
-""" # noqa
+"""  # noqa
 
     def test_read_sample_s390x_data(self):
         """Ensure the plugin can parse /proc/cpuinfo from an IBM zSeries machine."""
@@ -455,7 +455,7 @@
 address sizes   : 40 bits physical, 48 bits virtual
 power management: ts fid vid ttp
 
-"""
+"""  # noqa
 
     UP_PENTIUM_M = """
 processor       : 0
@@ -477,7 +477,7 @@
 flags           : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat clflush dts acpi mmx fxsr sse sse2 ss tm pbe nx est tm2
 bogomips        : 1198.25
 
-"""
+"""  # noqa
 
     def setUp(self):
         LandscapeTest.setUp(self)

=== modified file 'landscape/package/changer.py'
--- landscape/package/changer.py	2017-03-13 15:15:46 +0000
+++ landscape/package/changer.py	2017-04-05 14:19:44 +0000
@@ -1,7 +1,6 @@
 import logging
 import base64
 import time
-import sys
 import os
 import pwd
 import grp
@@ -14,6 +13,7 @@
     POLICY_STRICT, POLICY_ALLOW_INSTALLS, POLICY_ALLOW_ALL_CHANGES,
     UNKNOWN_PACKAGE_DATA_TIMEOUT)
 
+from landscape.deployment import get_bindir
 from landscape.lib.fs import create_binary_file
 from landscape.lib.log import log_failure
 from landscape.package.reporter import find_reporter_command
@@ -101,7 +101,7 @@
         if os.getuid() == 0:
             os.setgid(grp.getgrnam("landscape").gr_gid)
             os.setuid(pwd.getpwnam("landscape").pw_uid)
-        command = find_reporter_command()
+        command = find_reporter_command(self._config)
         if self._config.config is not None:
             command += " -c %s" % self._config.config
         os.system(command)
@@ -374,14 +374,16 @@
             "result-code": 1}
         return self._broker.send_message(response, self._session_id, True)
 
-    @staticmethod
-    def find_command():
-        return find_changer_command()
-
-
-def find_changer_command():
-    dirname = os.path.dirname(os.path.abspath(sys.argv[0]))
-    return os.path.join(dirname, "landscape-package-changer")
+    @classmethod
+    def find_command(cls, config=None):
+        """Return the path to the package-changer script.
+
+        The script's directory is derived from the provided config.
+        If that is None or doesn't have a "bindir" then directory of
+        sys.argv[0] is returned.
+        """
+        bindir = get_bindir(config)
+        return os.path.join(bindir, "landscape-package-changer")
 
 
 def main(args):

=== modified file 'landscape/package/releaseupgrader.py'
--- landscape/package/releaseupgrader.py	2017-03-22 09:29:17 +0000
+++ landscape/package/releaseupgrader.py	2017-04-05 14:19:44 +0000
@@ -4,11 +4,11 @@
 import os
 import pwd
 import shutil
-import sys
 import tarfile
 
 from twisted.internet.defer import succeed
 
+from landscape.deployment import get_bindir
 from landscape.lib.fetch import url_to_filename, fetch_to_files
 from landscape.lib.lsb_release import parse_lsb_release, LSB_RELEASE_FILENAME
 from landscape.lib.gpg import gpg_verify
@@ -252,7 +252,7 @@
             uid = None
             gid = None
 
-        reporter = find_reporter_command()
+        reporter = find_reporter_command(self._config)
 
         # Force an apt-update run, because the sources.list has changed
         args = ["--force-apt-update"]
@@ -274,9 +274,11 @@
 
         return self._send_message(message)
 
-    @staticmethod
-    def find_command():
-        return find_release_upgrader_command()
+    @classmethod
+    def find_command(cls, config=None):
+        """Return the path to the landscape-release-upgrader script."""
+        bindir = get_bindir(config)
+        return os.path.join(bindir, "landscape-release-upgrader")
 
     def _send_message(self, message):
         """Acquire a session ID and send the given message."""
@@ -289,12 +291,6 @@
         return deferred
 
 
-def find_release_upgrader_command():
-    """Return the path to the landscape-release-upgrader script."""
-    dirname = os.path.dirname(os.path.abspath(sys.argv[0]))
-    return os.path.join(dirname, "landscape-release-upgrader")
-
-
 def main(args):
     if os.getpgrp() != os.getpid():
         os.setsid()

=== modified file 'landscape/package/reporter.py'
--- landscape/package/reporter.py	2017-03-21 17:00:34 +0000
+++ landscape/package/reporter.py	2017-04-05 14:19:44 +0000
@@ -5,7 +5,6 @@
 
 import logging
 import time
-import sys
 import os
 import glob
 import apt_pkg
@@ -13,6 +12,7 @@
 from twisted.internet.defer import (
     Deferred, succeed, inlineCallbacks, returnValue)
 
+from landscape.deployment import get_bindir
 from landscape.lib import bpickle
 from landscape.lib.sequenceranges import sequence_to_ranges
 from landscape.lib.twisted_util import gather_results, spawn_process
@@ -751,6 +751,6 @@
         return run_task_handler(PackageReporter, args)
 
 
-def find_reporter_command():
-    dirname = os.path.dirname(os.path.abspath(sys.argv[0]))
-    return os.path.join(dirname, "landscape-package-reporter")
+def find_reporter_command(config=None):
+    bindir = get_bindir(config)
+    return os.path.join(bindir, "landscape-package-reporter")

=== modified file 'landscape/package/tests/test_changer.py'
--- landscape/package/tests/test_changer.py	2017-03-21 18:03:57 +0000
+++ landscape/package/tests/test_changer.py	2017-04-05 14:19:44 +0000
@@ -12,7 +12,7 @@
 
 from landscape.lib.fs import create_text_file, read_text_file, touch_file
 from landscape.package.changer import (
-    PackageChanger, main, find_changer_command, UNKNOWN_PACKAGE_DATA_TIMEOUT,
+    PackageChanger, main, UNKNOWN_PACKAGE_DATA_TIMEOUT,
     SUCCESS_RESULT, DEPENDENCY_ERROR_RESULT, POLICY_ALLOW_INSTALLS,
     POLICY_ALLOW_ALL_CHANGES, ERROR_RESULT)
 from landscape.package.store import PackageStore
@@ -662,15 +662,14 @@
 
     @patch("os.system")
     def test_spawn_reporter_after_running(self, system_mock):
-        with patch("landscape.package.changer.find_reporter_command",
-                   return_value="/fake/bin/landscape-package-reporter"):
-            # Add a task that will do nothing besides producing an
-            # answer.  The reporter is only spawned if at least one
-            # task was handled.
-            self.store.add_task("changer", {"type": "change-packages",
-                                            "operation-id": 123})
+        self.config.bindir = "/fake/bin"
+        # Add a task that will do nothing besides producing an
+        # answer.  The reporter is only spawned if at least one
+        # task was handled.
+        self.store.add_task("changer", {"type": "change-packages",
+                                        "operation-id": 123})
 
-            self.successResultOf(self.changer.run())
+        self.successResultOf(self.changer.run())
 
         system_mock.assert_called_once_with(
             "/fake/bin/landscape-package-reporter")
@@ -679,15 +678,14 @@
     def test_spawn_reporter_after_running_with_config(self, system_mock):
         """The changer passes the config to the reporter when running it."""
         self.config.config = "test.conf"
+        self.config.bindir = "/fake/bin"
 
-        with patch("landscape.package.changer.find_reporter_command",
-                   return_value="/fake/bin/landscape-package-reporter"):
-            # Add a task that will do nothing besides producing an
-            # answer.  The reporter is only spawned if at least one
-            # task was handled.
-            self.store.add_task("changer", {"type": "change-packages",
-                                            "operation-id": 123})
-            self.successResultOf(self.changer.run())
+        # Add a task that will do nothing besides producing an
+        # answer.  The reporter is only spawned if at least one
+        # task was handled.
+        self.store.add_task("changer", {"type": "change-packages",
+                                        "operation-id": 123})
+        self.successResultOf(self.changer.run())
 
         system_mock.assert_called_once_with(
             "/fake/bin/landscape-package-reporter -c test.conf")
@@ -703,6 +701,7 @@
         to report the recent changes.  If we're running as root, we want to
         change to the "landscape" user and "landscape" group.
         """
+        self.config.bindir = "/fake/bin"
 
         class FakeGroup(object):
             gr_gid = 199
@@ -713,15 +712,12 @@
         # We are running as root
         with patch("grp.getgrnam", return_value=FakeGroup()) as grnam_mock:
             with patch("pwd.getpwnam", return_value=FakeUser()) as pwnam_mock:
-                with patch(
-                        "landscape.package.changer.find_reporter_command",
-                        return_value="/fake/bin/landscape-package-reporter"):
-                    # Add a task that will do nothing besides producing an
-                    # answer.  The reporter is only spawned if at least
-                    # one task was handled.
-                    self.store.add_task("changer", {"type": "change-packages",
-                                                    "operation-id": 123})
-                    self.successResultOf(self.changer.run())
+                # Add a task that will do nothing besides producing an
+                # answer.  The reporter is only spawned if at least
+                # one task was handled.
+                self.store.add_task("changer", {"type": "change-packages",
+                                                "operation-id": 123})
+                self.successResultOf(self.changer.run())
 
         grnam_mock.assert_called_once_with("landscape")
         setgid_mock.assert_called_once_with(199)
@@ -778,20 +774,19 @@
         pgrp.assert_called_once_with()
         task.assert_called_once_with(PackageChanger, ["ARGS"])
 
-    def test_find_changer_command(self):
-        dirname = self.makeDir()
-        filename = self.makeFile("", dirname=dirname,
-                                 basename="landscape-package-changer")
-
-        saved_argv = sys.argv
-        try:
-            sys.argv = [os.path.join(dirname, "landscape-monitor")]
-
-            command = find_changer_command()
-
-            self.assertEqual(command, filename)
-        finally:
-            sys.argv = saved_argv
+    def test_find_command_with_bindir(self):
+        self.config.bindir = "/spam/eggs"
+        command = PackageChanger.find_command(self.config)
+
+        self.assertEqual("/spam/eggs/landscape-package-changer", command)
+
+    def test_find_command_default(self):
+        expected = os.path.join(
+            os.path.dirname(os.path.abspath(sys.argv[0])),
+            "landscape-package-changer")
+        command = PackageChanger.find_command()
+
+        self.assertEqual(expected, command)
 
     def test_transaction_error_with_unicode_data(self):
         self.store.set_hash_ids({HASH1: 1})

=== modified file 'landscape/package/tests/test_releaseupgrader.py'
--- landscape/package/tests/test_releaseupgrader.py	2017-03-23 07:43:57 +0000
+++ landscape/package/tests/test_releaseupgrader.py	2017-04-05 14:19:44 +0000
@@ -502,20 +502,20 @@
         packages.
         """
         upgrade_tool_directory = self.config.upgrade_tool_directory
-        open(os.path.join(upgrade_tool_directory, "somefile"), "w").close()
+        with open(os.path.join(upgrade_tool_directory, "somefile"), "w"):
+            pass
         os.mkdir(os.path.join(upgrade_tool_directory, "somedir"))
 
-        reporter_filename = self.makeFile("#!/bin/sh\n"
-                                          "echo $@\n"
-                                          "echo $(pwd)\n")
-        os.chmod(reporter_filename, 0o755)
+        self.write_script(
+            self.config,
+            "landscape-package-reporter",
+            "#!/bin/sh\n"
+            "echo $@\n"
+            "echo $(pwd)\n")
 
         deferred = Deferred()
 
-        @mock.patch("landscape.package.releaseupgrader.find_reporter_command")
-        def do_test(find_reporter_mock):
-
-            find_reporter_mock.return_value = reporter_filename
+        def do_test():
             result = self.upgrader.finish()
 
             def check_result(args):
@@ -526,7 +526,6 @@
                     b"--force-apt-update\n%s\n" % os.getcwd().encode("utf-8"))
                 self.assertEqual(err, b"")
                 self.assertEqual(code, 0)
-                find_reporter_mock.assert_called_once_with()
 
             result.addCallback(check_result)
             result.chainDeferred(deferred)
@@ -537,11 +536,7 @@
     @mock.patch("grp.getgrnam")
     @mock.patch("pwd.getpwnam")
     @mock.patch("os.getuid", return_value=0)
-    @mock.patch("landscape.package.releaseupgrader.find_reporter_command",
-                return_value="reporter")
-    def test_finish_as_root(
-            self, find_reporter_mock, getuid_mock, getpwnam_mock,
-            getgrnam_mock):
+    def test_finish_as_root(self, getuid_mock, getpwnam_mock, getgrnam_mock):
         """
         If the release-upgrader process is run as root, as it alwyas should,
         the L{ReleaseUpgrader.finish} method spawns the package-reporter with
@@ -573,7 +568,6 @@
             reactor.spawnProcess = saved_spawn_process
         self.assertEqual(spawn_process_calls, [True])
 
-        find_reporter_mock.assert_called_once_with()
         getuid_mock.assert_called_once_with()
         getpwnam_mock.assert_called_once_with("landscape")
         getgrnam_mock.assert_called_once_with("landscape")
@@ -583,16 +577,15 @@
         The L{ReleaseUpgrader.finish} method passes over to the reporter the
         configuration file the release-upgrader was called with.
         """
-        reporter_filename = self.makeFile("#!/bin/sh\necho $@\n")
-        os.chmod(reporter_filename, 0o755)
+        self.write_script(
+            self.config,
+            "landscape-package-reporter",
+            "#!/bin/sh\necho $@\n")
         self.config.config = "/some/config"
 
         deferred = Deferred()
 
-        @mock.patch("landscape.package.releaseupgrader.find_reporter_command")
-        def do_test(find_reporter_mock):
-
-            find_reporter_mock.return_value = reporter_filename
+        def do_test():
             result = self.upgrader.finish()
 
             def check_result(args):
@@ -601,7 +594,6 @@
                                       b"--config=/some/config\n")
                 self.assertEqual(err, b"")
                 self.assertEqual(code, 0)
-                find_reporter_mock.assert_called_once_with()
 
             result.addCallback(check_result)
             result.chainDeferred(deferred)

=== modified file 'landscape/package/tests/test_reporter.py'
--- landscape/package/tests/test_reporter.py	2017-03-21 17:00:34 +0000
+++ landscape/package/tests/test_reporter.py	2017-04-05 14:19:44 +0000
@@ -1116,20 +1116,19 @@
             self.assertEqual("RESULT", main(["ARGS"]))
         m.assert_called_once_with(PackageReporter, ["ARGS"])
 
-    def test_find_reporter_command(self):
-        dirname = self.makeDir()
-        filename = self.makeFile("", dirname=dirname,
-                                 basename="landscape-package-reporter")
-
-        saved_argv = sys.argv
-        try:
-            sys.argv = [os.path.join(dirname, "landscape-monitor")]
-
-            command = find_reporter_command()
-
-            self.assertEqual(command, filename)
-        finally:
-            sys.argv = saved_argv
+    def test_find_reporter_command_with_bindir(self):
+        self.config.bindir = "/spam/eggs"
+        command = find_reporter_command(self.config)
+
+        self.assertEqual("/spam/eggs/landscape-package-reporter", command)
+
+    def test_find_reporter_command_default(self):
+        expected = os.path.join(
+            os.path.dirname(os.path.abspath(sys.argv[0])),
+            "landscape-package-reporter")
+        command = find_reporter_command()
+
+        self.assertEqual(expected, command)
 
     def test_resynchronize(self):
         """

=== modified file 'landscape/tests/helpers.py'
--- landscape/tests/helpers.py	2017-03-27 06:26:21 +0000
+++ landscape/tests/helpers.py	2017-04-05 14:19:44 +0000
@@ -276,6 +276,18 @@
         self.addCleanup(self._clean_file, path)
         return path
 
+    def write_script(self, config, name, content, bindir=None):
+        """Return the path to the script after writing it to a temp dir."""
+        if bindir is None:
+            bindir = self.makeDir()
+        config.bindir = bindir
+        filename = self.makeFile(
+            content,
+            dirname=bindir,
+            basename=name)
+        os.chmod(filename, 0o755)
+        return filename
+
 
 class LandscapeIsolatedTest(LandscapeTest):
     """TestCase that also runs all test methods in a subprocess."""

=== modified file 'landscape/tests/test_deployment.py'
--- landscape/tests/test_deployment.py	2017-03-13 15:38:09 +0000
+++ landscape/tests/test_deployment.py	2017-04-05 14:19:44 +0000
@@ -2,12 +2,14 @@
 from textwrap import dedent
 import mock
 import os
+import os.path
+import sys
 
 from landscape.compat import StringIO
 from landscape.lib.fs import read_text_file, create_text_file
 
 from landscape.deployment import (
-    BaseConfiguration, Configuration, get_versioned_persist)
+    BaseConfiguration, Configuration, get_versioned_persist, get_bindir)
 from landscape.manager.config import ManagerConfiguration
 
 from landscape.tests.helpers import LandscapeTest, LogKeeperHelper
@@ -711,3 +713,37 @@
                              {"monitor": mock_monitor}):
             persist = get_versioned_persist(FakeService())
             mock_monitor.apply.assert_called_with(persist)
+
+
+class GetBindirTest(LandscapeTest):
+
+    BIN_DIR = os.path.dirname(os.path.abspath(sys.argv[0]))
+
+    def test_config_has_valid_bindir(self):
+        """get_bindir() returns the directory name found in the config."""
+        cfg = Configuration()
+        cfg.bindir = "/spam/eggs"
+        bindir = get_bindir(cfg)
+
+        self.assertEqual("/spam/eggs", bindir)
+
+    def test_config_has_None_bindir(self):
+        """get_bindir() """
+        cfg = Configuration()
+        cfg.bindir = None
+        bindir = get_bindir(cfg)
+
+        self.assertEqual(self.BIN_DIR, bindir)
+
+    def test_config_has_no_bindir(self):
+        """get_bindir() """
+        cfg = object()
+        bindir = get_bindir(cfg)
+
+        self.assertEqual(self.BIN_DIR, bindir)
+
+    def test_config_is_None(self):
+        """get_bindir() """
+        bindir = get_bindir(None)
+
+        self.assertEqual(self.BIN_DIR, bindir)

=== modified file 'landscape/tests/test_watchdog.py'
--- landscape/tests/test_watchdog.py	2017-04-04 08:50:05 +0000
+++ landscape/tests/test_watchdog.py	2017-04-05 14:19:44 +0000
@@ -517,12 +517,10 @@
 
     connector_factory = RemoteStubBrokerConnector
 
+    EXEC_NAME = "landscape-broker"
+
     def setUp(self):
         super(DaemonTestBase, self).setUp()
-        self.exec_dir = self.makeDir()
-        self.exec_name = os.path.join(self.exec_dir, "landscape-broker")
-        self.saved_argv = sys.argv
-        sys.argv = [os.path.join(self.exec_dir, "arv0_execname")]
 
         if hasattr(self, "broker_service"):
             # DaemonBrokerTest
@@ -539,7 +537,6 @@
         self.daemon = self.get_daemon()
 
     def tearDown(self):
-        sys.argv = self.saved_argv
         if hasattr(self, "broker_service"):
             # DaemonBrokerTest
             self.broker_service.stopService()
@@ -552,7 +549,7 @@
         else:
             MyDaemon = Daemon
         daemon = MyDaemon(self.connector, **kwargs)
-        daemon.program = os.path.basename(self.exec_name)
+        daemon.program = self.EXEC_NAME
         daemon.factor = 0.01
         return daemon
 
@@ -564,25 +561,39 @@
         self._mtime = os.path.getmtime(filename)
         self._filename = filename
 
-    def wait(self):
+    def wait(self, timeout=60):
+        if timeout:
+            end = time.time() + timeout
         while self._mtime == os.path.getmtime(self._filename):
             time.sleep(0.1)
+            if timeout and time.time() > end:
+                raise RuntimeError(
+                    "timed out after {} seconds".format(timeout))
 
 
 class DaemonTest(DaemonTestBase):
 
+    def _write_script(self, content):
+        filename = self.write_script(self.config, self.EXEC_NAME, content)
+        self.daemon.BIN_DIR = self.config.bindir
+        return filename
+
     def test_find_executable_works(self):
-        self.makeFile("I'm the broker.", path=self.exec_name)
-        self.assertEqual(self.daemon.find_executable(), self.exec_name)
+        expected = self._write_script("I'm the broker.")
+        command = self.daemon.find_executable()
+
+        self.assertEqual(expected, command)
 
     def test_find_executable_cant_find_file(self):
-        self.assertRaises(ExecutableNotFoundError, self.daemon.find_executable)
+        self.daemon.BIN_DIR = "/fake/bin"
+
+        with self.assertRaises(ExecutableNotFoundError):
+            self.daemon.find_executable()
 
     def test_start_process(self):
         output_filename = self.makeFile("NOT RUN")
-        self.makeFile('#!/bin/sh\necho "RUN $@" > %s' % output_filename,
-                      path=self.exec_name)
-        os.chmod(self.exec_name, 0o755)
+        self._write_script(
+            '#!/bin/sh\necho "RUN $@" > %s' % output_filename)
 
         waiter = FileChangeWaiter(output_filename)
 
@@ -597,16 +608,16 @@
 
     def test_start_process_with_verbose(self):
         output_filename = self.makeFile("NOT RUN")
-        self.makeFile('#!/bin/sh\necho "RUN $@" > %s' % output_filename,
-                      path=self.exec_name)
-        os.chmod(self.exec_name, 0o755)
+        self._write_script(
+            '#!/bin/sh\necho "RUN $@" > %s' % output_filename)
 
         waiter = FileChangeWaiter(output_filename)
 
         daemon = self.get_daemon(verbose=True)
+        daemon.BIN_DIR = self.config.bindir
         daemon.start()
 
-        waiter.wait()
+        waiter.wait(timeout=10)
 
         self.assertEqual(open(output_filename).read(),
                          "RUN --ignore-sigint\n")
@@ -616,15 +627,14 @@
     def test_kill_process_with_sigterm(self):
         """The stop() method sends SIGTERM to the subprocess."""
         output_filename = self.makeFile("NOT RUN")
-        self.makeFile("#!%s\n"
-                      "import time\n"
-                      "file = open(%r, 'w')\n"
-                      "file.write('RUN')\n"
-                      "file.close()\n"
-                      "time.sleep(1000)\n"
-                      % (sys.executable, output_filename),
-                      path=self.exec_name)
-        os.chmod(self.exec_name, 0o755)
+        self._write_script(
+            ("#!%s\n"
+             "import time\n"
+             "file = open(%r, 'w')\n"
+             "file.write('RUN')\n"
+             "file.close()\n"
+             "time.sleep(1000)\n"
+             ) % (sys.executable, output_filename))
 
         waiter = FileChangeWaiter(output_filename)
         self.daemon.start()
@@ -639,16 +649,15 @@
         some time after the SIGTERM was issued and didn't work.
         """
         output_filename = self.makeFile("NOT RUN")
-        self.makeFile("#!%s\n"
-                      "import signal, os\n"
-                      "signal.signal(signal.SIGTERM, signal.SIG_IGN)\n"
-                      "file = open(%r, 'w')\n"
-                      "file.write('RUN')\n"
-                      "file.close()\n"
-                      "os.kill(os.getpid(), signal.SIGSTOP)\n"
-                      % (sys.executable, output_filename),
-                      path=self.exec_name)
-        os.chmod(self.exec_name, 0o755)
+        self._write_script(
+            ("#!%s\n"
+             "import signal, os\n"
+             "signal.signal(signal.SIGTERM, signal.SIG_IGN)\n"
+             "file = open(%r, 'w')\n"
+             "file.write('RUN')\n"
+             "file.close()\n"
+             "os.kill(os.getpid(), signal.SIGSTOP)\n"
+             ) % (sys.executable, output_filename))
 
         self.addCleanup(setattr, landscape.watchdog, "SIGKILL_DELAY",
                         landscape.watchdog.SIGKILL_DELAY)
@@ -666,9 +675,8 @@
         died.
         """
         output_filename = self.makeFile("NOT RUN")
-        self.makeFile('#!/bin/sh\necho "RUN" > %s' % output_filename,
-                      path=self.exec_name)
-        os.chmod(self.exec_name, 0o755)
+        self._write_script(
+            '#!/bin/sh\necho "RUN" > %s' % output_filename)
 
         self.daemon.start()
 
@@ -682,9 +690,8 @@
         certain amount of time, just like C{wait}.
         """
         output_filename = self.makeFile("NOT RUN")
-        self.makeFile('#!/bin/sh\necho "RUN" > %s' % output_filename,
-                      path=self.exec_name)
-        os.chmod(self.exec_name, 0o755)
+        self._write_script(
+            '#!/bin/sh\necho "RUN" > %s' % output_filename)
 
         self.daemon.start()
 
@@ -695,7 +702,8 @@
     def test_wait_or_die_terminates(self):
         """wait_or_die eventually terminates the process."""
         output_filename = self.makeFile("NOT RUN")
-        self.makeFile("""\
+        self._write_script(
+            """\
 #!%(exe)s
 import time
 import signal
@@ -708,10 +716,7 @@
     file.close()
 signal.signal(signal.SIGTERM, term)
 time.sleep(999)
-        """
-                      % {"exe": sys.executable, "out": output_filename},
-                      path=self.exec_name)
-        os.chmod(self.exec_name, 0o755)
+        """ % {"exe": sys.executable, "out": output_filename})
 
         self.addCleanup(setattr, landscape.watchdog, "GRACEFUL_WAIT_PERIOD",
                         landscape.watchdog.GRACEFUL_WAIT_PERIOD)
@@ -728,16 +733,15 @@
         and terminating don't work.
         """
         output_filename = self.makeFile("NOT RUN")
-        self.makeFile("#!%s\n"
-                      "import signal, os\n"
-                      "signal.signal(signal.SIGTERM, signal.SIG_IGN)\n"
-                      "file = open(%r, 'w')\n"
-                      "file.write('RUN')\n"
-                      "file.close()\n"
-                      "os.kill(os.getpid(), signal.SIGSTOP)\n"
-                      % (sys.executable, output_filename),
-                      path=self.exec_name)
-        os.chmod(self.exec_name, 0o755)
+        self._write_script(
+            ("#!%s\n"
+             "import signal, os\n"
+             "signal.signal(signal.SIGTERM, signal.SIG_IGN)\n"
+             "file = open(%r, 'w')\n"
+             "file.write('RUN')\n"
+             "file.close()\n"
+             "os.kill(os.getpid(), signal.SIGSTOP)\n"
+             ) % (sys.executable, output_filename))
 
         self.addCleanup(setattr, landscape.watchdog, "SIGKILL_DELAY",
                         landscape.watchdog.SIGKILL_DELAY)
@@ -789,9 +793,8 @@
 
         output_filename = self.makeFile("NOT RUN")
 
-        self.makeFile("#!/bin/sh\necho RUN >> %s" % output_filename,
-                      path=self.exec_name)
-        os.chmod(self.exec_name, 0o755)
+        self._write_script(
+            "#!/bin/sh\necho RUN >> %s" % output_filename)
 
         def got_result(result):
             self.assertEqual(len(list(open(output_filename))),
@@ -813,6 +816,7 @@
         reactor.callLater(1, result.callback, None)
 
         daemon = self.get_daemon(reactor=reactor)
+        daemon.BIN_DIR = self.config.bindir
         daemon.start()
 
         return result
@@ -832,9 +836,8 @@
 
         output_filename = self.makeFile("NOT RUN")
 
-        self.makeFile("#!/bin/sh\necho RUN >> %s" % output_filename,
-                      path=self.exec_name)
-        os.chmod(self.exec_name, 0o755)
+        self._write_script(
+            "#!/bin/sh\necho RUN >> %s" % output_filename)
 
         def got_result(result):
             # Pay attention to the +1 bellow. It's the reason for this test.
@@ -866,6 +869,7 @@
         # It's important to call start() shortly after the mocking above,
         # as we don't want anyone else getting the fake time.
         daemon = self.get_daemon(reactor=reactor)
+        daemon.BIN_DIR = self.config.bindir
         daemon.start()
 
         def mock_reactor_stop():
@@ -891,7 +895,7 @@
         the username of the daemon. It also specifies the gid as the primary
         group of that user.
         """
-        self.makeFile("", path=self.exec_name)
+        self._write_script("#!/bin/sh")
 
         class getpwnam_result:
             pw_uid = 123
@@ -903,6 +907,7 @@
         reactor = mock.Mock()
 
         daemon = self.get_daemon(reactor=reactor)
+        daemon.BIN_DIR = self.config.bindir
         daemon.start()
 
         getuid.assert_called_with()
@@ -926,10 +931,11 @@
         If the watchdog is not running as root, no uid or gid switching will
         occur.
         """
-        self.makeFile("", path=self.exec_name)
+        self._write_script("#!/bin/sh")
 
         reactor = mock.Mock()
         daemon = self.get_daemon(reactor=reactor)
+        daemon.BIN_DIR = self.config.bindir
         daemon.start()
 
         reactor.spawnProcess.assert_called_with(
@@ -943,10 +949,11 @@
         If the daemon is specified to run as root, and the watchdog is running
         as root, no uid or gid switching will occur.
         """
-        self.makeFile("", path=self.exec_name)
+        self._write_script("#!/bin/sh")
         reactor = mock.Mock()
 
         daemon = self.get_daemon(reactor=reactor, username="root")
+        daemon.BIN_DIR = self.config.bindir
         daemon.start()
 
         reactor.spawnProcess.assert_called_with(

=== modified file 'landscape/watchdog.py'
--- landscape/watchdog.py	2017-04-05 11:55:26 +0000
+++ landscape/watchdog.py	2017-04-05 14:19:44 +0000
@@ -22,7 +22,7 @@
 from twisted.application.service import Service, Application
 from twisted.application.app import startApplication
 
-from landscape.deployment import init_logging, Configuration
+from landscape.deployment import init_logging, Configuration, get_bindir
 from landscape.lib.encoding import encode_values
 from landscape.lib.twisted_util import gather_results
 from landscape.lib.log import log_failure
@@ -76,6 +76,8 @@
     factor = 1.1
     options = None
 
+    BIN_DIR = None
+
     def __init__(self, connector, reactor=reactor, verbose=False,
                  config=None):
         self._connector = connector
@@ -115,7 +117,7 @@
         If the executable can't be found, L{ExecutableNotFoundError} will be
         raised.
         """
-        dirname = os.path.dirname(os.path.abspath(sys.argv[0]))
+        dirname = self.BIN_DIR or get_bindir()
         executable = os.path.join(dirname, self.program)
         if not os.path.exists(executable):
             raise ExecutableNotFoundError("%s doesn't exist" % (executable,))