Patchwork D2546: tests: port test-bookmarks.t extension to Python 3

login
register
mail settings
Submitter phabricator
Date March 2, 2018, 4:18 p.m.
Message ID <1a3009faa018171995bdfdd7e1215acf@localhost.localdomain>
Download mbox | patch
Permalink /patch/28695/
State Not Applicable
Headers show

Comments

phabricator - March 2, 2018, 4:18 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG4df06d2f60e1: tests: port test-bookmarks.t extension to Python 3 (authored by durin42, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2546?vs=6340&id=6359

REVISION DETAIL
  https://phab.mercurial-scm.org/D2546

AFFECTED FILES
  tests/test-bookmarks.t

CHANGE DETAILS




To: durin42, #hg-reviewers, pulkit
Cc: mercurial-devel

Patch

diff --git a/tests/test-bookmarks.t b/tests/test-bookmarks.t
--- a/tests/test-bookmarks.t
+++ b/tests/test-bookmarks.t
@@ -980,14 +980,14 @@ 
   >    tr = orig(self, desc, report)
   >    def sleep(*args, **kwargs):
   >        retry = 20
-  >        while retry > 0 and not os.path.exists("$TESTTMP/unpause"):
+  >        while retry > 0 and not os.path.exists(b"$TESTTMP/unpause"):
   >            retry -= 1
   >            time.sleep(0.5)
-  >        if os.path.exists("$TESTTMP/unpause"):
-  >            os.remove("$TESTTMP/unpause")
+  >        if os.path.exists(b"$TESTTMP/unpause"):
+  >            os.remove(b"$TESTTMP/unpause")
   >    # It is important that this finalizer start with 'a', so it runs before
   >    # the changelog finalizer appends to the changelog.
-  >    tr.addfinalize('a-sleep', sleep)
+  >    tr.addfinalize(b'a-sleep', sleep)
   >    return tr
   > 
   > def extsetup(ui):