r2235 - in zope.testrunner/trunk/debian (1 file)
jinty-guest at users.alioth.debian.org
jinty-guest at users.alioth.debian.org
Sun May 15 19:09:23 UTC 2011
Date: Sunday, May 15, 2011 @ 19:09:17
Author: jinty-guest
Revision: 2235
Take into account that control files are utf-8 and stop intercepting stdout.
Modified:
zope.testrunner/trunk/debian/test_one_package_in_throwaway_vm.py
Modified: zope.testrunner/trunk/debian/test_one_package_in_throwaway_vm.py
===================================================================
--- zope.testrunner/trunk/debian/test_one_package_in_throwaway_vm.py 2011-05-15 19:01:31 UTC (rev 2234)
+++ zope.testrunner/trunk/debian/test_one_package_in_throwaway_vm.py 2011-05-15 19:09:17 UTC (rev 2235)
@@ -55,15 +55,12 @@
env.update(os.environ) # ???
p = subprocess.Popen(['sudo', '-u', 'nobody', binary],
stdin=subprocess.PIPE,
- stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
env=env)
stdout, stderr = p.communicate()
finally:
shutil.rmtree(tmpdir)
msg = ""
- if stdout:
- msg = msg + "Test Printed:\n\n%s\n" % stdout.decode('utf-8')
if stderr:
msg = msg + "Test Printed to stderr:\n\n%s\n" % stderr.decode('utf-8')
self.assertFalse(stderr, msg)
@@ -92,7 +89,7 @@
if dep != '@':
return [Dependency(dep)]
deps = []
- data = open('debian/control', 'r').read()
+ data = open('debian/control', 'r', encoding='utf-8').read()
for line in data.splitlines():
if not line.startswith("Package:"):
continue
More information about the pkg-zope-developers
mailing list