Merge ~simpoir/ubuntu/+source/landscape-client:disco-landscape-client-backports-1788219 into ubuntu/+source/landscape-client:ubuntu/disco-devel

[Simon Poirier]

[Andreas Hasenack (ahasenack)]

Your fixes are changing upstream code directly. You need to create debian/patches/ files for each fix instead, and each patch file needs a DEP3 header. Here is a template of such a header:
Description: <short description, required>
 <long description that can span multiple lines, optional>
Author: <name and email of author, optional>
Origin: upstream, <URL to commit>
Bug: <URL to the upstream bug report if any, implies patch has been forwarded, optional>
Bug-Ubuntu: <URL to the vendor bug report if any, optional>
Last-Update: 2018-05-10 <YYYY-MM-DD, last update of the meta-information, optional>

I tweaked it a bit for the landscape-client use case already.

Quick example:
- create quiltrc config file per https://wiki.debian.org/UsingQuilt#Using_.quiltrc_configuration_file
- patch upstream code as you have
- git diff > debian/patches/<name-of-patch-file-you-want>.patch
- edit debian/patches/series and add the name to the ordered list
- git add the patch and the series file
- revert the source code change
- update the dep3 header per above template (you can also run quilt header -e --dep3 <name-of-patch-file>)
- commit
- apply quilt patch: quilt push -a
- refresh patch, so that the flags specified in quiltrc apply: quilt refresh <name>
- remove patch: quilt pop -a

For d/changelog. please try to use this formatting:
  * d/p/<name-of-patch>: <short description> (LP: #xxxxxx)

The dep3changelog tool can do the above for you, extracting the information from the dep3 header of the patch. It will also tell you if the dep3 header is correct or not.

If a fix needs multiple entries, then what you did with indenting is correct, using "-" for the leve immediatelly after "*".

review: Needs Fixing

[Andreas Hasenack (ahasenack)]

Thanks for the changes, +1

review: Approve

[Andreas Hasenack (ahasenack)]

Tagged and uploaded.

diff --git a/debian/changelog b/debian/changelog
index 7615a82..5d64e8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+landscape-client (18.01-0ubuntu6) disco; urgency=medium
+
+  * debian/patches/nutanix-kvm.patch: Update vm_info.py to include Nutanix
+    hypervisor.
+  * Fixes for release-upgrade (LP: #1699179).
+    - debian/patches/release-upgrade-success.patch: Enable landscape-client to
+      survive trusty upgrade. (LP: #1670291)
+    - debian/patches/post-upgrade-reboot.patch: Force reboot operation in
+      case systemd fails. (LP: #1670291)
+  * debian/patches/unicode-tags-script.patch: Permit environments
+    containing unicode chars for script execution. (LP: #1765518)
+  * debian/patches/1616116-resync-loop.patch:
+    Clear hash id database on package resync. (LP: #1616116)
+
+ -- Simon Poirier <[e-mail]>  Tue, 27 Nov 2018 09:24:22 -0500
+
 landscape-client (18.01-0ubuntu5) disco; urgency=medium
 
   * No-change rebuild to build for python3.7 as the default.
diff --git a/debian/patches/1616116-resync-loop.patch b/debian/patches/1616116-resync-loop.patch
new file mode 100644
index 0000000..a3f055b
--- /dev/null
+++ b/debian/patches/1616116-resync-loop.patch
@@ -0,0 +1,142 @@
+Description: Clear hash id database on package resync.
+ This should avoid loop when inconsistencies are present in the database
+ through either corruption or server-restore.
+Author: Simon Poirier <[e-mail]>
+Origin: upstream, https://github.com/CanonicalLtd/landscape-client/commit/666cd32dbdedcc29c90154015bbe2ea0e52924e8
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1616116
+Last-Update: 2018-11-23
+
+diff --git a/landscape/client/package/reporter.py b/landscape/client/package/reporter.py
+index afca838c..c48a4c04 100644
+--- a/landscape/client/package/reporter.py
++++ b/landscape/client/package/reporter.py
+@@ -400,7 +400,10 @@ class PackageReporter(PackageTaskHandler):
+ 
+         return result
+ 
++    @inlineCallbacks
+     def _handle_resynchronize(self):
++        self._store.clear_hash_ids()
++        yield self._remove_hash_id_db()
+         self._store.clear_available()
+         self._store.clear_available_upgrades()
+         self._store.clear_installed()
+@@ -408,8 +411,6 @@ class PackageReporter(PackageTaskHandler):
+         self._store.clear_hash_id_requests()
+         self._store.clear_autoremovable()
+ 
+-        return succeed(None)
+-
+     def _handle_unknown_packages(self, hashes):
+ 
+         self._facade.ensure_channels_reloaded()
+@@ -445,6 +446,18 @@ class PackageReporter(PackageTaskHandler):
+ 
+         return result
+ 
++    def _remove_hash_id_db(self):
++
++        def _remove_it(hash_id_db_filename):
++            if hash_id_db_filename and os.path.exists(hash_id_db_filename):
++                logging.warning(
++                    "Removing cached hash=>id database %s",
++                    hash_id_db_filename)
++                os.remove(hash_id_db_filename)
++        result = self._determine_hash_id_db_filename()
++        result.addCallback(_remove_it)
++        return result
++
+     def remove_expired_hash_id_requests(self):
+         now = time.time()
+         timeout = now - HASH_ID_REQUEST_TIMEOUT
+diff --git a/landscape/client/package/tests/test_reporter.py b/landscape/client/package/tests/test_reporter.py
+index 03d2e368..851c8eb9 100644
+--- a/landscape/client/package/tests/test_reporter.py
++++ b/landscape/client/package/tests/test_reporter.py
+@@ -1204,10 +1204,11 @@ class PackageReporterAptTest(LandscapeTest):
+ 
+         self.assertEqual(expected, command)
+ 
++    @inlineCallbacks
+     def test_resynchronize(self):
+         """
+         When a resynchronize task arrives, the reporter should clear
+-        out all the data in the package store, except the hash ids.
++        out all the data in the package store, including the hash ids.
+ 
+         This is done in the reporter so that we know it happens when
+         no other reporter is possibly running at the same time.
+@@ -1220,6 +1221,16 @@ class PackageReporterAptTest(LandscapeTest):
+         self.facade.reload_channels()
+         message_store = self.broker_service.message_store
+         message_store.set_accepted_types(["package-locks"])
++
++        # create hash_id file
++        message_store.set_server_uuid("uuid")
++        self.facade.set_arch("arch")
++        hash_id_file = os.path.join(
++            self.config.hash_id_directory, "uuid_codename_arch")
++        os.makedirs(self.config.hash_id_directory)
++        with open(hash_id_file, "w"):
++            pass
++
+         self.store.set_hash_ids({foo_hash: 3, HASH2: 4})
+         self.store.add_available([1])
+         self.store.add_available_upgrades([2])
+@@ -1243,30 +1254,33 @@ class PackageReporterAptTest(LandscapeTest):
+         self.store.add_task("reporter", {"type": "resynchronize"})
+ 
+         deferred = self.reporter.run()
+-
+-        def check_result(result):
+-            # The hashes should not go away.
+-            hash1 = self.store.get_hash_id(foo_hash)
+-            hash2 = self.store.get_hash_id(HASH2)
+-            self.assertEqual([hash1, hash2], [3, 4])
+-
+-            # But the other data should.
+-            self.assertEqual(self.store.get_available_upgrades(), [])
+-
+-            # After running the resychronize task, detect_packages_changes is
+-            # called, and the existing known hashes are made available.
+-            self.assertEqual(self.store.get_available(), [4])
+-            self.assertEqual(self.store.get_installed(), [3])
+-            self.assertEqual(self.store.get_locked(), [3])
+-
+-            # The two original hash id requests are gone, and a new hash id
+-            # request should be detected for HASH3.
+-            [request] = self.store.iter_hash_id_requests()
+-            self.assertEqual(request.hashes, [HASH3, HASH1])
+-
+-        deferred.addCallback(check_result)
+         self.reactor.advance(0)
+-        return deferred
++        with mock.patch(
++            "landscape.client.package.taskhandler.parse_lsb_release",
++            side_effect=lambda _: {"code-name": "codename"}
++        ):
++            yield deferred
++
++        # The hashes should go away to avoid loops
++        # when server gets restored to an early state.
++        hash1 = self.store.get_hash_id(foo_hash)
++        hash2 = self.store.get_hash_id(HASH2)
++        self.assertNotEqual(hash1, 3)
++        self.assertNotEqual(hash2, 4)
++        self.assertFalse(os.path.exists(hash_id_file))
++        self.assertEqual(self.store.get_available_upgrades(), [])
++
++        # After running the resychronize task, the hash db is empty,
++        # thus detect_packages_changes will generate an empty set until
++        # next run when hash-id db is populated again.
++        self.assertEqual(self.store.get_available(), [])
++        self.assertEqual(self.store.get_installed(), [])
++        self.assertEqual(self.store.get_locked(), [])
++
++        # The two original hash id requests are gone, and a new hash id
++        # request should be detected for HASH3.
++        [request] = self.store.iter_hash_id_requests()
++        self.assertEqual(request.hashes, [HASH3, HASH2, foo_hash, HASH1])
+ 
+     @mock.patch("logging.warning")
+     def test_run_apt_update(self, warning_mock):
diff --git a/debian/patches/nutanix-kvm.patch b/debian/patches/nutanix-kvm.patch
new file mode 100644
index 0000000..cf8bbba
--- /dev/null
+++ b/debian/patches/nutanix-kvm.patch
@@ -0,0 +1,17 @@
+Description: Update vm_info.py to include Nutanix hypervisor
+Author: Simon Poirier <[e-mail]>
+Origin: upstream, https://github.com/CanonicalLtd/landscape-client/commit/6aa197e083e08734ab84e77039ce4fd057ec268c
+Last-Update: 2018-11-23
+
+Index: sru/landscape/lib/vm_info.py
+===================================================================
+--- sru.orig/landscape/lib/vm_info.py	2018-11-23 10:08:28.936161178 -0500
++++ sru/landscape/lib/vm_info.py	2018-11-23 10:08:28.932161181 -0500
+@@ -73,6 +73,7 @@
+         ("google", b"gce"),
+         ("innotek", b"virtualbox"),
+         ("microsoft", b"hyperv"),
++        ("nutanix", b"kvm"),
+         ("openstack", b"kvm"),
+         ("qemu", b"kvm"),
+         ("vmware", b"vmware"))
diff --git a/debian/patches/post-upgrade-reboot.patch b/debian/patches/post-upgrade-reboot.patch
new file mode 100644
index 0000000..f4deedb
--- /dev/null
+++ b/debian/patches/post-upgrade-reboot.patch
@@ -0,0 +1,132 @@
+Description: Force reboot operation in case systemd fails.
+Author: Simon Poirier <[e-mail]>
+Origin: upstream, https://github.com/CanonicalLtd/landscape-client/commit/e5e086565df841688e435890445104bdb3197c75
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1670291
+Last-Update: 2018-11-23
+
+diff --git a/landscape/client/manager/shutdownmanager.py b/landscape/client/manager/shutdownmanager.py
+index 2f4b6cc1..8c6f7224 100644
+--- a/landscape/client/manager/shutdownmanager.py
++++ b/landscape/client/manager/shutdownmanager.py
+@@ -45,7 +45,7 @@ class ShutdownManager(ManagerPlugin):
+         protocol = ShutdownProcessProtocol()
+         protocol.set_timeout(self.registry.reactor)
+         protocol.result.addCallback(self._respond_success, operation_id)
+-        protocol.result.addErrback(self._respond_failure, operation_id)
++        protocol.result.addErrback(self._respond_failure, operation_id, reboot)
+         command, args = self._get_command_and_args(protocol, reboot)
+         self._process_factory.spawnProcess(protocol, command, args=args)
+ 
+@@ -58,9 +58,31 @@ class ShutdownManager(ManagerPlugin):
+             lambda _: self.registry.broker.stop_exchanger())
+         return deferred
+ 
+-    def _respond_failure(self, failure, operation_id):
++    def _respond_failure(self, failure, operation_id, reboot):
+         logging.info("Shutdown request failed.")
+-        return self._respond(FAILED, failure.value.data, operation_id)
++        failure_report = '\n'.join([
++            failure.value.data,
++            "",
++            "Attempting to force {operation}. Please note that if this "
++            "succeeds, Landscape will have no way of knowing and will still "
++            "mark this activity as having failed. It is recommended you check "
++            "the state of the machine manually to determine whether "
++            "{operation} succeeded.".format(
++                operation="reboot" if reboot else "shutdown")
++        ])
++        deferred = self._respond(FAILED, failure_report, operation_id)
++        # Add another callback spawning the poweroff or reboot command (which
++        # seem more reliable in aberrant situations like a post-trusty release
++        # upgrade where upstart has been replaced with systemd). If this
++        # succeeds, we won't have any opportunity to report it and if it fails
++        # we'll already have responded indicating we're attempting to force
++        # the operation so either way there's no sense capturing output
++        protocol = ProcessProtocol()
++        command, args = self._get_command_and_args(protocol, reboot, True)
++        deferred.addCallback(
++            lambda _: self._process_factory.spawnProcess(
++                protocol, command, args=args))
++        return deferred
+ 
+     def _respond(self, status, data, operation_id):
+         message = {"type": "operation-result",
+@@ -70,19 +92,23 @@ class ShutdownManager(ManagerPlugin):
+         return self.registry.broker.send_message(
+             message, self._session_id, True)
+ 
+-    def _get_command_and_args(self, protocol, reboot):
++    def _get_command_and_args(self, protocol, reboot, force=False):
+         """
+         Returns a C{command, args} 2-tuple suitable for use with
+         L{IReactorProcess.spawnProcess}.
+         """
+-        minutes = "+%d" % (protocol.delay // 60,)
+-        if reboot:
+-            args = ["/sbin/shutdown", "-r", minutes,
+-                    "Landscape is rebooting the system"]
+-        else:
+-            args = ["/sbin/shutdown", "-h", minutes,
+-                    "Landscape is shutting down the system"]
+-        return "/sbin/shutdown", args
++        minutes = None if force else "+%d" % (protocol.delay // 60,)
++        args = {
++            (False, False): [
++                "/sbin/shutdown", "-h", minutes,
++                "Landscape is shutting down the system"],
++            (False, True): [
++                "/sbin/shutdown", "-r", minutes,
++                "Landscape is rebooting the system"],
++            (True, False): ["/sbin/poweroff"],
++            (True, True): ["/sbin/reboot"],
++        }[force, reboot]
++        return args[0], args
+ 
+ 
+ class ShutdownProcessProtocol(ProcessProtocol):
+diff --git a/landscape/client/manager/tests/test_shutdownmanager.py b/landscape/client/manager/tests/test_shutdownmanager.py
+index 0d31bdff..54ff4f04 100644
+--- a/landscape/client/manager/tests/test_shutdownmanager.py
++++ b/landscape/client/manager/tests/test_shutdownmanager.py
+@@ -1,5 +1,6 @@
+ from twisted.python.failure import Failure
+ from twisted.internet.error import ProcessTerminated, ProcessDone
++from twisted.internet.protocol import ProcessProtocol
+ 
+ from landscape.lib.testing import StubProcessFactory
+ from landscape.client.manager.plugin import SUCCEEDED, FAILED
+@@ -76,16 +77,28 @@ class ShutdownManagerTest(LandscapeTest):
+         be failed.  Data printed by the process prior to the failure is
+         included in the activity's result text.
+         """
+-        message = {"type": "shutdown", "reboot": False, "operation-id": 100}
++        message = {"type": "shutdown", "reboot": True, "operation-id": 100}
+         self.plugin.perform_shutdown(message)
+ 
+         def restart_failed(message_id):
+             self.assertTrue(self.broker_service.exchanger.is_urgent())
+-            self.assertEqual(
+-                self.broker_service.message_store.get_pending_messages(),
+-                [{"type": "operation-result", "api": b"3.2",
+-                  "operation-id": 100, "timestamp": 0, "status": FAILED,
+-                  "result-text": u"Failure text is reported."}])
++            messages = self.broker_service.message_store.get_pending_messages()
++            self.assertEqual(len(messages), 1)
++            message = messages[0]
++            self.assertEqual(message["type"], "operation-result")
++            self.assertEqual(message["api"], b"3.2")
++            self.assertEqual(message["operation-id"], 100)
++            self.assertEqual(message["timestamp"], 0)
++            self.assertEqual(message["status"], FAILED)
++            self.assertIn(u"Failure text is reported.", message["result-text"])
++
++            # Check that after failing, we attempt to force the shutdown by
++            # switching the binary called
++            [spawn1_args, spawn2_args] = self.process_factory.spawns
++            protocol = spawn2_args[0]
++            self.assertIsInstance(protocol, ProcessProtocol)
++            self.assertEqual(spawn2_args[1:3],
++                             ("/sbin/reboot", ["/sbin/reboot"]))
+ 
+         [arguments] = self.process_factory.spawns
+         protocol = arguments[0]
diff --git a/debian/patches/release-upgrade-success.patch b/debian/patches/release-upgrade-success.patch
new file mode 100644
index 0000000..7a2ce1f
--- /dev/null
+++ b/debian/patches/release-upgrade-success.patch
@@ -0,0 +1,23 @@
+Description: Enable landscape-client to survive trusty upgrade
+ At present, landscape-client fails to report the completion (or failure)
+ of a release upgrade from trusty to xenial due to the delayed import of
+ twisted.internet.unix (part of LP: #1670291)
+Author: Simon Poirier <[e-mail]>
+Origin: https://github.com/CanonicalLtd/landscape-client/commit/d2bd25caafd0406ef762c718cac66a7f6ad94596
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1670291
+Last-Update: 2018-11-23
+
+Index: sru/landscape/client/package/releaseupgrader.py
+===================================================================
+--- sru.orig/landscape/client/package/releaseupgrader.py	2018-11-23 10:29:20.563300247 -0500
++++ sru/landscape/client/package/releaseupgrader.py	2018-11-23 10:29:20.559300250 -0500
+@@ -165,6 +165,9 @@
+ 
+         @param current_code_name: The code-name of the current release.
+         """
++        # This bizarre (and apparently unused) import is a workaround for
++        # LP: #1670291 -- see comments in that ticket for an explanation
++        import twisted.internet.unix  # noqa: F401
+         upgrade_tool_directory = self._config.upgrade_tool_directory
+ 
+         # On some releases the upgrade-tool doesn't support the allow third
diff --git a/debian/patches/series b/debian/patches/series
index 1cf42b5..8fe2ee6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,8 @@
 remove-landscape-link.patch
 detect-cloudstack-kvm-1754073.patch
 apt-sources-replace-1771443.patch
+nutanix-kvm.patch
+release-upgrade-success.patch
+post-upgrade-reboot.patch
+unicode-tags-script.patch
+1616116-resync-loop.patch
diff --git a/debian/patches/unicode-tags-script.patch b/debian/patches/unicode-tags-script.patch
new file mode 100644
index 0000000..7282de7
--- /dev/null
+++ b/debian/patches/unicode-tags-script.patch
@@ -0,0 +1,167 @@
+Description: Permit environments containing unicode chars for script execution
+Author: Simon Poirier <[e-mail]>
+Origin: upstream, https://github.com/CanonicalLtd/landscape-client/commit/d5c37413254f32e10f63f83279b92ec5ba377f22
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1765518
+Last-Update: 2018-11-23
+
+diff --git a/landscape/client/manager/scriptexecution.py b/landscape/client/manager/scriptexecution.py
+index 203d31df..4481e17e 100644
+--- a/landscape/client/manager/scriptexecution.py
++++ b/landscape/client/manager/scriptexecution.py
+@@ -4,6 +4,7 @@ Functionality for running arbitrary shell scripts.
+ @var ALL_USERS: A token indicating all users should be allowed.
+ """
+ import os
++import sys
+ import os.path
+ import tempfile
+ import shutil
+@@ -105,6 +106,13 @@ class ScriptRunnerMixin(object):
+             uid = None
+         if gid == os.getgid():
+             gid = None
++        env = {
++            key: (
++                value.encode(sys.getfilesystemencoding(), errors='replace')
++                if isinstance(value, unicode) else value
++            )
++            for key, value in env.items()
++        }
+ 
+         pp = ProcessAccumulationProtocol(
+             self.registry.reactor, self.size_limit, self.truncation_indicator)
+@@ -249,7 +257,14 @@ class ScriptExecutionPlugin(ManagerPlugin, ScriptRunnerMixin):
+         self.write_script_file(
+             script_file, filename, shell, code, uid, gid)
+ 
+-        env = {"PATH": UBUNTU_PATH, "USER": user or "", "HOME": path or ""}
++        env = {
++            "PATH": UBUNTU_PATH,
++            "USER": user or "",
++            "HOME": path or "",
++        }
++        for locale_var in ("LANG", "LC_ALL", "LC_CTYPE"):
++            if locale_var in os.environ:
++                env[locale_var] = os.environ[locale_var]
+         if server_supplied_env:
+             env.update(server_supplied_env)
+         old_umask = os.umask(0o022)
+diff --git a/landscape/client/manager/tests/test_scriptexecution.py b/landscape/client/manager/tests/test_scriptexecution.py
+index 744ea006..2f219490 100644
+--- a/landscape/client/manager/tests/test_scriptexecution.py
++++ b/landscape/client/manager/tests/test_scriptexecution.py
+@@ -25,10 +25,22 @@ from landscape.client.tests.helpers import LandscapeTest, ManagerHelper
+ def get_default_environment():
+     username = pwd.getpwuid(os.getuid())[0]
+     uid, gid, home = get_user_info(username)
+-    return {
++    env = {
+         "PATH": UBUNTU_PATH,
+         "USER": username,
+-        "HOME": home}
++        "HOME": home,
++    }
++    for var in {"LANG", "LC_ALL", "LC_CTYPE"}:
++        if var in os.environ:
++            env[var] = os.environ[var]
++    return env
++
++
++def encoded_default_environment():
++    return {
++        key: value.encode('ascii', 'replace')
++        for key, value in get_default_environment().items()
++    }
+ 
+ 
+ class RunScriptTests(LandscapeTest):
+@@ -99,6 +111,35 @@ class RunScriptTests(LandscapeTest):
+         result.addCallback(check_environment)
+         return result
+ 
++    def test_server_supplied_env_with_funky_chars(self):
++        """
++        Server-supplied environment variables can be unicode strings; client
++        should pass these to the script's environment encoded appropriately
++        (encoding from Python's sys.getfilesystemencoding).
++        """
++        patch_fs_encoding = mock.patch(
++            'sys.getfilesystemencoding', return_value='UTF-8'
++        )
++        patch_fs_encoding.start()
++
++        server_supplied_env = {
++            "LEMMY": u"Mot\N{LATIN SMALL LETTER O WITH DIAERESIS}rhead",
++            # Somehow it's just not as cool...
++        }
++        result = self.plugin.run_script(
++            "/bin/sh", "echo $LEMMY",
++            server_supplied_env=server_supplied_env)
++
++        def check_environment(results):
++            self.assertEqual(server_supplied_env["LEMMY"] + u'\n', results)
++
++        def cleanup(result):
++            patch_fs_encoding.stop()
++            return result
++
++        result.addCallback(check_environment).addBoth(cleanup)
++        return result
++
+     def test_server_supplied_env_overrides_client(self):
+         """
+         Server-supplied environment variables override client default
+@@ -424,7 +465,7 @@ class RunScriptTests(LandscapeTest):
+         self.assertEqual(len(factory.spawns), 1)
+         spawn = factory.spawns[0]
+         self.assertIn("LANDSCAPE_ATTACHMENTS", spawn[3])
+-        attachment_dir = spawn[3]["LANDSCAPE_ATTACHMENTS"]
++        attachment_dir = spawn[3]["LANDSCAPE_ATTACHMENTS"].decode('ascii')
+         self.assertEqual(stat.S_IMODE(os.stat(attachment_dir).st_mode), 0o700)
+         filename = os.path.join(attachment_dir, "file 1")
+         self.assertEqual(stat.S_IMODE(os.stat(filename).st_mode), 0o600)
+@@ -598,7 +639,7 @@ class RunScriptTests(LandscapeTest):
+         def spawnProcess(protocol, filename, args, env, path, uid, gid):
+             self.assertIsNone(uid)
+             self.assertIsNone(gid)
+-            self.assertEqual(get_default_environment(), env)
++            self.assertEqual(encoded_default_environment(), env)
+             protocol.result_deferred.callback(None)
+ 
+         process_factory = mock.Mock()
+@@ -737,7 +778,7 @@ class ScriptExecutionMessageTests(LandscapeTest):
+         self.assertIn("USER", factory.spawns[0][3])
+         self.assertIn("PATH", factory.spawns[0][3])
+         self.assertIn("Dog", factory.spawns[0][3])
+-        self.assertEqual("Woof", factory.spawns[0][3]["Dog"])
++        self.assertEqual(b"Woof", factory.spawns[0][3]["Dog"])
+ 
+         self.assertMessages(
+             self.broker_service.message_store.get_pending_messages(), [])
+@@ -777,7 +818,7 @@ class ScriptExecutionMessageTests(LandscapeTest):
+         def check(_):
+             process_factory.spawnProcess.assert_called_with(
+                 mock.ANY, mock.ANY, args=mock.ANY, uid=None, gid=None,
+-                path=mock.ANY, env=get_default_environment())
++                path=mock.ANY, env=encoded_default_environment())
+ 
+         return result.addCallback(check)
+ 
+@@ -876,7 +917,7 @@ class ScriptExecutionMessageTests(LandscapeTest):
+                   "status": SUCCEEDED}])
+             process_factory.spawnProcess.assert_called_with(
+                 mock.ANY, mock.ANY, args=mock.ANY, uid=None, gid=None,
+-                path=mock.ANY, env=get_default_environment())
++                path=mock.ANY, env=encoded_default_environment())
+ 
+         result = self._send_script(sys.executable, "print 'hi'")
+         return result.addCallback(got_result)
+@@ -907,7 +948,7 @@ class ScriptExecutionMessageTests(LandscapeTest):
+                 u"\x7fELF\x01\x01\x01\x00\x00\x00\ufffd\x01")
+             process_factory.spawnProcess.assert_called_with(
+                 mock.ANY, mock.ANY, args=mock.ANY, uid=None, gid=None,
+-                path=mock.ANY, env=get_default_environment())
++                path=mock.ANY, env=encoded_default_environment())
+ 
+         result = self._send_script(sys.executable, "print 'hi'")
+         return result.addCallback(got_result)