Patchwork [4,of,4] py3: byte-stringify test-blackbox.t

login
register
mail settings
Submitter Yuya Nishihara
Date March 4, 2018, 10:19 p.m.
Message ID <8c6317e695dc2e9721b8.1520201988@mimosa>
Download mbox | patch
Permalink /patch/29025/
State Accepted
Headers show

Comments

Yuya Nishihara - March 4, 2018, 10:19 p.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1520200551 18000
#      Sun Mar 04 16:55:51 2018 -0500
# Node ID 8c6317e695dc2e9721b83f67079c5d129685395e
# Parent  1bae4c65f65cce76e5337fd392db53ca442bdfec
py3: byte-stringify test-blackbox.t

Patch

diff --git a/contrib/python3-whitelist b/contrib/python3-whitelist
--- a/contrib/python3-whitelist
+++ b/contrib/python3-whitelist
@@ -16,6 +16,7 @@  test-backwards-remove.t
 test-basic.t
 test-bheads.t
 test-bisect2.t
+test-blackbox.t
 test-bookmarks-current.t
 test-bookmarks-merge.t
 test-bookmarks-rebase.t
diff --git a/tests/test-blackbox.t b/tests/test-blackbox.t
--- a/tests/test-blackbox.t
+++ b/tests/test-blackbox.t
@@ -265,7 +265,7 @@  Test log recursion from dirty status che
   > from mercurial import context, error, extensions
   > x=[False]
   > def status(orig, *args, **opts):
-  >     args[0].repo().ui.log("broken", "recursion?")
+  >     args[0].repo().ui.log(b"broken", b"recursion?")
   >     return orig(*args, **opts)
   > def reposetup(ui, repo):
   >     extensions.wrapfunction(context.basectx, 'status', status)
@@ -344,7 +344,7 @@  blackbox should work if repo.ui.log is n
   > from mercurial import registrar, scmutil
   > cmdtable = {}
   > command = registrar.command(cmdtable)
-  > @command('raise')
+  > @command(b'raise')
   > def raisecmd(*args):
   >     raise RuntimeError('raise')
   > EOF