# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 2018-10-12 16:32:12
# Node ID 9b3470dd98702531c6a23fe7b5bbfe4c6931e86b
# Parent  a7cdd81f191bb9ac46ded5f98c0c783446285042

tests: add lots of globs and conditional output lines

The test now passes on Python 3. I'm going to do one follow-up where
I'll adjust some grep calls to improve our checking of things on
Python 3.

Differential Revision: https://phab.mercurial-scm.org/D5004

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,7 +47,7 @@ another bad extension
 
   $ 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
 
@@ -55,9 +55,11 @@ show traceback
   *** 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 @@ show traceback for ImportError of hgext.
   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 @@ confirm that there's no crash when an ex
 
   $ 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