This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4546

tests: handle Python 3 not quoting non-empty-directory error
ClosedPublic

Authored by durin42 on Sep 12 2018, 11:40 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGcb1329738d64: tests: handle Python 3 not quoting non-empty-directory error
Summary

I assume this happens on Windows too, so I did the same regex on both
versions of the output. The whole message printed by these aborts
comes from Python, so if we want to exert control over the quoting
here it'll be a bit of a pain.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Sep 12 2018, 11:40 AM
pulkit accepted this revision.Sep 12 2018, 11:44 AM
Closed by commit rHGcb1329738d64: tests: handle Python 3 not quoting non-empty-directory error (authored by durin42). · Explain WhySep 12 2018, 11:55 AM
This revision was automatically updated to reflect the committed changes.
mharbison72 added a subscriber: mharbison72.Sep 12 2018, 9:27 PM

This motivated me to install py3, and give it a try. But the test runner keeps crashing on str/bytes issues. I fixed a couple, but it looks like treating everything as bytes can be a problem, since environment stuff internally wants to uppercase, which wants a str (apparently).

$ /c/Program\ Files/Python37/python run-tests.py --local test-update-names.t
Traceback (most recent call last):
  File "run-tests.py", line 3194, in <module>
    sys.exit(runner.run(sys.argv[1:]))
  File "run-tests.py", line 2475, in run
    self._checktools()
  File "run-tests.py", line 3123, in _checktools
    found = self._findprogram(p)
  File "run-tests.py", line 3112, in _findprogram
    for p in osenvironb.get(b'PATH', dpb).split(sepb):
  File "c:\Program Files\Python37\lib\_collections_abc.py", line 660, in get
    return self[key]
  File "c:\Program Files\Python37\lib\os.py", line 675, in __getitem__
    value = self._data[self.encodekey(key)]
  File "c:\Program Files\Python37\lib\os.py", line 744, in encodekey
    return encode(key).upper()
  File "c:\Program Files\Python37\lib\os.py", line 739, in check_str
    raise TypeError("str expected, not %s" % type(value).__name__)
TypeError: str expected, not bytes

I "fixed" that with the following...

@@ -3107,10 +3107,12 @@ class TestRunner(object):
 
     def _findprogram(self, program):
         """Search PATH for a executable program"""
-        dpb = _bytespath(os.defpath)
-        sepb = _bytespath(os.pathsep)
-        for p in osenvironb.get(b'PATH', dpb).split(sepb):
-            name = os.path.join(p, program)
+#        dpb = _bytespath(os.defpath)
+#        sepb = _bytespath(os.pathsep)
+        dpb = os.defpath
+        sepb = os.pathsep
+        for p in osenvironb.get('PATH', dpb).split(sepb):
+            name = os.path.join(_bytespath(p), program)
             if os.name == 'nt' or os.access(name, os.X_OK):
                 return name
         return None

... and then got a crash with a warning that the Windows bytes API is deprecated.

$ /c/Program\ Files/Python37/python run-tests.py --local test-update-names.t
run-tests.py:2491: DeprecationWarning: The Windows bytes API has been deprecated, use Unicode filenames instead
  os, 'getcwdb', os.getcwd)()
Traceback (most recent call last):
  File "run-tests.py", line 3196, in <module>
    sys.exit(runner.run(sys.argv[1:]))
  File "run-tests.py", line 2480, in run
    result = self._run(testdescs)
  File "run-tests.py", line 2491, in _run
    os, 'getcwdb', os.getcwd)()
  File "c:\Program Files\Python37\lib\os.py", line 682, in __setitem__
    key = self.encodekey(key)
  File "c:\Program Files\Python37\lib\os.py", line 744, in encodekey
    return encode(key).upper()
  File "c:\Program Files\Python37\lib\os.py", line 739, in check_str
    raise TypeError("str expected, not %s" % type(value).__name__)
TypeError: str expected, not bytes

Revision Contents
Changeset List

PathPackages
Mtests/test-merge1.t (4 lines)
Mtests/test-update-names.t (4 lines)

Diff 10956

tests/test-merge1.t

$ hg update 0 $ hg update 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
Test interrupted updates by having a non-empty dir with the same name as one Test interrupted updates by having a non-empty dir with the same name as one
of the files in a commit we're updating to of the files in a commit we're updating to
$ mkdir b && touch b/nonempty $ mkdir b && touch b/nonempty
$ hg up $ hg up
abort: Unlinking directory not permitted: '$TESTTMP/t/b' (windows !) abort: Unlinking directory not permitted: '?\$TESTTMP/t/b'? (re) (windows !)
abort: Directory not empty: '$TESTTMP/t/b' (no-windows !) abort: Directory not empty: '?\$TESTTMP/t/b'? (re) (no-windows !)
[255] [255]
$ hg ci $ hg ci
abort: last update was interrupted abort: last update was interrupted
(use 'hg update' to get a consistent checkout) (use 'hg update' to get a consistent checkout)
[255] [255]
$ hg sum $ hg sum
parent: 0:538afb845929 parent: 0:538afb845929
commit #0 commit #0

tests/test-update-names.t

make sure that this does not erase untracked data make sure that this does not erase untracked data
$ hg up 0 $ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkdir name $ mkdir name
$ echo text > name/file $ echo text > name/file
$ hg st $ hg st
? name/file ? name/file
$ hg up 1 $ hg up 1
abort: Unlinking directory not permitted: '$TESTTMP/r1/r2/name' (windows !) abort: Unlinking directory not permitted: '?$TESTTMP/r1/r2/name'? (re) (windows !)
abort: Directory not empty: '$TESTTMP/r1/r2/name' (no-windows !) abort: Directory not empty: '?\$TESTTMP/r1/r2/name'? (re) (no-windows !)
[255] [255]
$ cat name/file $ cat name/file
text text
$ cd .. $ cd ..
#if symlink #if symlink
Test update when two commits have symlinks that point to different folders Test update when two commits have symlinks that point to different folders