Changeset 37b07a5 in trunk for src/allmydata/test/test_runner.py

Timestamp:

2010-07-25T08:32:16Z (15 years ago)

Author:

david-sarah <david-sarah@…>

Branches:

master

Children:

9d04b2a

Parents:

54a9ba8

Message:

Changes to Tahoe needed to work with new zetuptoolz (that does not use .exe wrappers on Windows), and to support Unicode arguments and stdout/stderr -- v5

File:

• src/allmydata/test/test_runner.py (modified) (2 diffs)

src/allmydata/test/test_runner.py ¶

@@ -8 +8 @@
 from cStringIO import StringIO
 from allmydata.util import fileutil, pollmixin
+from allmydata.util.encodingutil import unicode_to_argv, unicode_to_output
 from allmydata.scripts import runner
 
@@ -45 +46 @@
             self.failUnless(out.startswith(required_ver_and_path),
                             str((out, err, rc_or_sig, required_ver_and_path)))
+        d.addCallback(_cb)
+        return d
+
+    def test_unicode_arguments_and_output(self):
+        self.skip_if_cannot_run_bintahoe()
+
+        tricky = u"\u2621"
+        try:
+            tricky_arg = unicode_to_argv(tricky, mangle=True)
+            tricky_out = unicode_to_output(tricky)
+        except UnicodeEncodeError:
+            raise unittest.SkipTest("A non-ASCII argument/output could not be encoded on this platform.")
+
+        d = utils.getProcessOutputAndValue(bintahoe, args=[tricky_arg], env=os.environ)
+        def _cb(res):
+            out, err, rc_or_sig = res
+            self.failUnlessEqual(rc_or_sig, 1, str((out, err, rc_or_sig)))
+            self.failUnlessIn("Unknown command: "+tricky_out, out)
         d.addCallback(_cb)
         return d