Patchwork [5,of,5] py3: add some b'' to make test-lock-badness.t happy

login
register
mail settings
Submitter Yuya Nishihara
Date March 3, 2018, 5:12 p.m.
Message ID <9bb6d8cd916dcbcab77f.1520097153@mimosa>
Download mbox | patch
Permalink /patch/28794/
State Accepted
Headers show

Comments

Yuya Nishihara - March 3, 2018, 5:12 p.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1520091588 18000
#      Sat Mar 03 10:39:48 2018 -0500
# Node ID 9bb6d8cd916dcbcab77fb4414b27c6d1070657cd
# Parent  f9c0c67072248a5f88ffc0baa33fa0c0f31d43ef
py3: add some b'' to make test-lock-badness.t happy

Patch

diff --git a/contrib/python3-whitelist b/contrib/python3-whitelist
--- a/contrib/python3-whitelist
+++ b/contrib/python3-whitelist
@@ -166,6 +166,7 @@  test-issue842.t
 test-journal-exists.t
 test-largefiles-small-disk.t
 test-locate.t
+test-lock-badness.t
 test-logexchange.t
 test-lrucachedict.py
 test-mactext.t
diff --git a/tests/test-lock-badness.t b/tests/test-lock-badness.t
--- a/tests/test-lock-badness.t
+++ b/tests/test-lock-badness.t
@@ -22,8 +22,8 @@  Test that raising an exception in the re
   > def acquiretestlock(repo, releaseexc):
   >     def unlock():
   >         if releaseexc:
-  >             raise error.Abort('expected release exception')
-  >     l = repo._lock(repo.vfs, 'testlock', False, unlock, None, 'test lock')
+  >             raise error.Abort(b'expected release exception')
+  >     l = repo._lock(repo.vfs, b'testlock', False, unlock, None, b'test lock')
   >     return l
   > 
   > @command(b'testlockexc')
@@ -35,7 +35,7 @@  Test that raising an exception in the re
   >         try:
   >             testlock = acquiretestlock(repo, False)
   >         except error.LockHeld:
-  >             raise error.Abort('lockfile on disk even after releasing!')
+  >             raise error.Abort(b'lockfile on disk even after releasing!')
   >         testlock.release()
   > EOF
   $ cat >> $HGRCPATH << EOF