[PATCH 3 of 3 v2] run-tests: use strings for env object

[timeless]

# HG changeset patch
# User timeless <timeless at mozdev.org>
# Date 1459319268 0
#      Wed Mar 30 06:27:48 2016 +0000
# Node ID 3ac7919ccd75ec18862379804a4227f652f346c3
# Parent  bc149b7f13ad842e7945704a6b27467a1481dab4
run-tests: use strings for env object

diff --git a/tests/run-tests.py b/tests/run-tests.py
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -804,14 +804,16 @@
             offset = '' if i == 0 else '%s' % i
             env["HGPORT%s" % offset] = '%s' % (self._startport + i)
         env = os.environ.copy()
-        env['TESTTMP'] = self._testtmp
-        env['HOME'] = self._testtmp
+        testtmp = self._testtmp.decode('utf-8')
+        threadtmp = self._threadtmp.decode('utf-8')
+        env['TESTTMP'] = testtmp
+        env['HOME'] = testtmp
         # This number should match portneeded in _getport
         for port in xrange(3):
             # This list should be parallel to _portmap in _getreplacements
             defineport(port)
-        env["HGRCPATH"] = os.path.join(self._threadtmp, b'.hgrc')
-        env["DAEMON_PIDS"] = os.path.join(self._threadtmp, b'daemon.pids')
+        env["HGRCPATH"] = os.path.join(threadtmp, '.hgrc')
+        env["DAEMON_PIDS"] = os.path.join(threadtmp, 'daemon.pids')
         env["HGEDITOR"] = ('"' + sys.executable + '"'
                            + ' -c "import sys; sys.exit(0)"')
         env["HGMERGE"] = "internal:merge"