diff -r 87c4253bebdb -r cdccfe20eed7 tests/autodiff.py
--- a/tests/autodiff.py	Thu Apr 05 17:00:15 2018 +0530
+++ b/tests/autodiff.py	Thu Apr 05 17:13:09 2018 +0530
@@ -5,6 +5,7 @@
 from mercurial import (
     error,
     patch,
+    pycompat,
     registrar,
     scmutil,
 )
@@ -16,6 +17,7 @@
     [(b'', b'git', b'', b'git upgrade mode (yes/no/auto/warn/abort)')],
     b'[OPTION]... [FILE]...')
 def autodiff(ui, repo, *pats, **opts):
+    opts = pycompat.byteskwargs(opts)
     diffopts = patch.difffeatureopts(ui, opts)
     git = opts.get(b'git', b'no')
     brokenfiles = set()