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