##// END OF EJS Templates
python2-compat: fix extensions' tests on python2...
marmoute -
r49239:0b2469bf default
parent child Browse files
Show More
@@ -53,7 +53,8 b' another bad extension'
53
53
54 $ hg -q help help 2>&1 |grep extension
54 $ hg -q help help 2>&1 |grep extension
55 *** failed to import extension "badext" from $TESTTMP/badext.py: bit bucket overflow
55 *** failed to import extension "badext" from $TESTTMP/badext.py: bit bucket overflow
56 *** failed to import extension "badext2": No module named 'badext2'
56 *** failed to import extension "badext2": No module named 'badext2' (py3 !)
57 *** failed to import extension "badext2": No module named badext2 (no-py3 !)
57
58
58 show traceback
59 show traceback
59
60
@@ -61,7 +62,8 b' show traceback'
61 *** failed to import extension "badext" from $TESTTMP/badext.py: bit bucket overflow
62 *** failed to import extension "badext" from $TESTTMP/badext.py: bit bucket overflow
62 Traceback (most recent call last):
63 Traceback (most recent call last):
63 Exception: bit bucket overflow
64 Exception: bit bucket overflow
64 *** failed to import extension "badext2": No module named 'badext2'
65 *** failed to import extension "badext2": No module named 'badext2' (py3 !)
66 *** failed to import extension "badext2": No module named badext2 (no-py3 !)
65 Traceback (most recent call last):
67 Traceback (most recent call last):
66 ImportError: No module named badext2 (no-py3 !)
68 ImportError: No module named badext2 (no-py3 !)
67 ImportError: No module named 'hgext.badext2' (py3 no-py36 !)
69 ImportError: No module named 'hgext.badext2' (py3 no-py36 !)
@@ -123,7 +125,8 b' show traceback for ImportError of hgext.'
123 Traceback (most recent call last): (py3 !)
125 Traceback (most recent call last): (py3 !)
124 ImportError: No module named 'hgext3rd.badext2' (py3 no-py36 !)
126 ImportError: No module named 'hgext3rd.badext2' (py3 no-py36 !)
125 ModuleNotFoundError: No module named 'hgext3rd.badext2' (py36 !)
127 ModuleNotFoundError: No module named 'hgext3rd.badext2' (py36 !)
126 *** failed to import extension "badext2": No module named 'badext2'
128 *** failed to import extension "badext2": No module named 'badext2' (py3 !)
129 *** failed to import extension "badext2": No module named badext2 (no-py3 !)
127 Traceback (most recent call last):
130 Traceback (most recent call last):
128 ImportError: No module named 'hgext.badext2' (py3 no-py36 !)
131 ImportError: No module named 'hgext.badext2' (py3 no-py36 !)
129 ModuleNotFoundError: No module named 'hgext.badext2' (py36 !)
132 ModuleNotFoundError: No module named 'hgext.badext2' (py36 !)
@@ -161,7 +164,8 b" confirm that there's no crash when an ex"
161
164
162 $ hg help --keyword baddocext
165 $ hg help --keyword baddocext
163 *** failed to import extension "badext" from $TESTTMP/badext.py: bit bucket overflow
166 *** failed to import extension "badext" from $TESTTMP/badext.py: bit bucket overflow
164 *** failed to import extension "badext2": No module named 'badext2'
167 *** failed to import extension "badext2": No module named 'badext2' (py3 !)
168 *** failed to import extension "badext2": No module named badext2 (no-py3 !)
165 Topics:
169 Topics:
166
170
167 extensions Using Additional Features
171 extensions Using Additional Features
@@ -649,7 +649,7 b" Python 3's lazy importer verifies module"
649 module stub. Our custom lazy importer for Python 2 always returns a stub.
649 module stub. Our custom lazy importer for Python 2 always returns a stub.
650
650
651 $ (PYTHONPATH=${PYTHONPATH}${PATHSEP}${TESTTMP}; hg --config extensions.checkrelativity=$TESTTMP/checkrelativity.py checkrelativity) || true
651 $ (PYTHONPATH=${PYTHONPATH}${PATHSEP}${TESTTMP}; hg --config extensions.checkrelativity=$TESTTMP/checkrelativity.py checkrelativity) || true
652 *** failed to import extension "checkrelativity" from $TESTTMP/checkrelativity.py: No module named 'extlibroot.lsub1.lsub2.notexist'
652 *** failed to import extension "checkrelativity" from $TESTTMP/checkrelativity.py: No module named 'extlibroot.lsub1.lsub2.notexist' (py3 !)
653 hg: unknown command 'checkrelativity' (py3 !)
653 hg: unknown command 'checkrelativity' (py3 !)
654 (use 'hg help' for a list of commands) (py3 !)
654 (use 'hg help' for a list of commands) (py3 !)
655
655
@@ -1939,7 +1939,8 b' Prohibit the use of unicode strings as t'
1939 > test_unicode_default_value = $TESTTMP/test_unicode_default_value.py
1939 > test_unicode_default_value = $TESTTMP/test_unicode_default_value.py
1940 > EOF
1940 > EOF
1941 $ hg -R $TESTTMP/opt-unicode-default dummy
1941 $ hg -R $TESTTMP/opt-unicode-default dummy
1942 *** failed to import extension "test_unicode_default_value" from $TESTTMP/test_unicode_default_value.py: unicode 'value' found in cmdtable.dummy
1942 *** failed to import extension "test_unicode_default_value" from $TESTTMP/test_unicode_default_value.py: unicode 'value' found in cmdtable.dummy (py3 !)
1943 *** failed to import extension "test_unicode_default_value" from $TESTTMP/test_unicode_default_value.py: unicode u'value' found in cmdtable.dummy (no-py3 !)
1943 *** (use b'' to make it byte string)
1944 *** (use b'' to make it byte string)
1944 hg: unknown command 'dummy'
1945 hg: unknown command 'dummy'
1945 (did you mean summary?)
1946 (did you mean summary?)
General Comments 0
You need to be logged in to leave comments. Login now