| Submitter | timeless@mozdev.org |
|---|---|
| Date | Sept. 11, 2015, 12:32 a.m. |
| Message ID | <cc7fc4b67ea0880faa4f.1441931539@waste.org> |
| Download | mbox | patch |
| Permalink | /patch/10476/ |
| State | Accepted |
| Headers | show |
Comments
On Thu, Sep 10, 2015 at 07:32:19PM -0500, timeless@mozdev.org wrote: > # HG changeset patch > # User timeless@mozdev.org > # Date 1441928746 14400 > # Thu Sep 10 19:45:46 2015 -0400 > # Node ID cc7fc4b67ea0880faa4f8d823ba8fc348f71c0f9 > # Parent ea489d94e1dc1fc3dc1dcbef1c86c18c49605ed1 > test-bad-extension: reduce dependencies on other things queued this one, thanks > > test-bad-extension would jitter if the format of the first line > of hg help changed, which isn't relevant to its goal. > > 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 > @@ -9,31 +9,26 @@ > > badext2 = > > EOF > > - $ hg -q help help > + $ 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 > - hg help [-ec] [TOPIC] > - > - show help for a given topic or a help overview > > show traceback > > - $ hg -q help help --traceback 2>&1 | grep -v '^ ' > + $ 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 > Traceback (most recent call last): > ImportError: No module named badext2 > - hg help [-ec] [TOPIC] > - > - show help for a given topic or a help overview > > show traceback for ImportError of hgext.name if debug is set > (note that --debug option isn't applied yet when loading extensions) > > - $ hg help help --traceback --config ui.debug=True 2>&1 \ > - > | grep -v '^ ' | head -n10 > + $ (hg -q help help --traceback --config ui.debug=True 2>&1) \ > + > | grep -v '^ ' \ > + > | egrep 'extension..[^p]|^Exception|Traceback|ImportError|not import' > *** failed to import extension badext from $TESTTMP/badext.py: bit bucket overflow > Traceback (most recent call last): > Exception: bit bucket overflow > @@ -43,4 +38,3 @@ > *** failed to import extension badext2: No module named badext2 > Traceback (most recent call last): > ImportError: No module named badext2 > - hg help [-ec] [TOPIC] > _______________________________________________ > Mercurial-devel mailing list > Mercurial-devel@selenic.com > https://selenic.com/mailman/listinfo/mercurial-devel
Patch
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 @@ -9,31 +9,26 @@ > badext2 = > EOF - $ hg -q help help + $ 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 - hg help [-ec] [TOPIC] - - show help for a given topic or a help overview show traceback - $ hg -q help help --traceback 2>&1 | grep -v '^ ' + $ 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 Traceback (most recent call last): ImportError: No module named badext2 - hg help [-ec] [TOPIC] - - show help for a given topic or a help overview show traceback for ImportError of hgext.name if debug is set (note that --debug option isn't applied yet when loading extensions) - $ hg help help --traceback --config ui.debug=True 2>&1 \ - > | grep -v '^ ' | head -n10 + $ (hg -q help help --traceback --config ui.debug=True 2>&1) \ + > | grep -v '^ ' \ + > | egrep 'extension..[^p]|^Exception|Traceback|ImportError|not import' *** failed to import extension badext from $TESTTMP/badext.py: bit bucket overflow Traceback (most recent call last): Exception: bit bucket overflow @@ -43,4 +38,3 @@ *** failed to import extension badext2: No module named badext2 Traceback (most recent call last): ImportError: No module named badext2 - hg help [-ec] [TOPIC]