D5004: tests: add lots of globs and conditional output lines

[durin42 (Augie Fackler)]

durin42 updated this revision to Diff 11918.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D5004?vs=11915&id=11918

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

AFFECTED FILES
  tests/test-bad-extension.t

CHANGE DETAILS

diff --git a/tests/test-bad-extension.t b/tests/test-bad-extension.t
--- a/tests/test-bad-extension.t
+++ b/tests/test-bad-extension.t
@@ -47,17 +47,19 @@
 
   $ hg -q help help 2>&1 |grep extension
   *** failed to import extension badext from $TESTTMP/badext.py: bit bucket overflow
-  *** failed to import extension badext2: No module named badext2
+  *** failed to import extension badext2: No module named *badext2* (glob)
 
 show traceback
 
   $ hg -q help help --traceback 2>&1 | egrep ' extension|^Exception|Traceback|ImportError'
   *** failed to import extension badext from $TESTTMP/badext.py: bit bucket overflow
   Traceback (most recent call last):
   Exception: bit bucket overflow
-  *** failed to import extension badext2: No module named badext2
+  *** failed to import extension badext2: No module named *badext2* (glob)
   Traceback (most recent call last):
-  ImportError: No module named badext2
+  ImportError: No module named badext2 (no-py3k !)
+  Traceback (most recent call last): (py3k !)
+  Traceback (most recent call last): (py3k !)
 
 names of extensions failed to load can be accessed via extensions.notloaded()
 
@@ -95,15 +97,18 @@
   debug.extensions:     - invoking registered callbacks: 'baddocext'
   debug.extensions:     > callbacks completed in * (glob)
   debug.extensions:   - loading extension: 'badext2'
-  debug.extensions:     - could not import hgext.badext2 (No module named badext2): trying hgext3rd.badext2
+  debug.extensions:     - could not import hgext.badext2 (No module named *badext2*): trying hgext3rd.badext2 (glob)
   Traceback (most recent call last):
-  ImportError: No module named *badext2 (glob)
-  debug.extensions:     - could not import hgext3rd.badext2 (No module named badext2): trying badext2
+  ImportError: No module named badext2 (no-py3k !)
+  debug.extensions:     - could not import hgext3rd.badext2 (No module named *badext2*): trying badext2 (glob)
   Traceback (most recent call last):
-  ImportError: No module named *badext2 (glob)
-  *** failed to import extension badext2: No module named badext2
+  ImportError: No module named badext2 (no-py3k !)
+  Traceback (most recent call last): (py3k !)
+  *** failed to import extension badext2: No module named *badext2* (glob)
   Traceback (most recent call last):
-  ImportError: No module named badext2
+  Traceback (most recent call last): (py3k !)
+  Traceback (most recent call last): (py3k !)
+  ImportError: No module named badext2 (no-py3k !)
   debug.extensions: > loaded 2 extensions, total time * (glob)
   debug.extensions: - loading configtable attributes
   debug.extensions: - executing uisetup hooks
@@ -131,7 +136,7 @@
 
   $ hg help --keyword baddocext
   *** failed to import extension badext from $TESTTMP/badext.py: bit bucket overflow
-  *** failed to import extension badext2: No module named badext2
+  *** failed to import extension badext2: No module named *badext2* (glob)
   Topics:
   
    extensions Using Additional Features



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