Mercurial > hg-stable
changeset 11291:543597fae51d
error: update test-trusted.py
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 04 Jun 2010 23:00:22 -0500 |
| parents | 8c6c7f6347a3 |
| children | 037d910734de |
| files | tests/test-trusted.py tests/test-trusted.py.out |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-trusted.py Fri Jun 04 22:54:43 2010 -0500 +++ b/tests/test-trusted.py Fri Jun 04 23:00:22 2010 -0500 @@ -180,10 +180,10 @@ try: testui(user='abc', group='def', silent=True) -except error.ConfigError, inst: +except error.ParseError, inst: print inst try: testui(debug=True, silent=True) -except error.ConfigError, inst: +except error.ParseError, inst: print inst
--- a/tests/test-trusted.py.out Fri Jun 04 22:54:43 2010 -0500 +++ b/tests/test-trusted.py.out Fri Jun 04 23:00:22 2010 -0500 @@ -155,6 +155,6 @@ # parse error # different user, different group Not trusting file .hg/hgrc from untrusted user abc, group def -Ignored: config error at .hg/hgrc:1: 'foo' +('foo', '.hg/hgrc:1') # same user, same group -config error at .hg/hgrc:1: 'foo' +('foo', '.hg/hgrc:1')