Solaris fixes for a few tests

[Alexis S. L. Carvalho]

Thus spake Giorgos Keramidas:
> ,--------------------------------------------------------------------------
> | system:      FreeBSD
> | version:     7.0-CURRENT #1: Thu Oct 19 02:54:22 EEST 2006 (2006.10.18.15.56.11)
> +--------------------------------------------------------------------------
> | ..................................................................................................
> | ERROR: test-push-http output changed
> | --- Expected output
> | +++ Test output
> | @@ -9,9 +9,10 @@
> |  searching for changes
> |  push not authorized
> |  % expect authorization error: must have authorized user
> | +abort: cannot start server: Address already in use

It looks like another process was already listening on port 20059 (maybe
from a previous run of the test suite?).  Can you try it again? (you can
run a single test with "run-tests.py test-push-http" in the tests/
directory)

> | ERROR: test-static-http output changed

> | ERROR: test-static-http failed with error code 3840

Something went really wrong here - the test failed with a weird error
code before printing anything.  Is this reproducible?

> ,--------------------------------------------------------------------------
> | system:      Solaris
> | version:     Solaris 10 1/06 s10x_u1wos_19a X86 (amd64)
> +--------------------------------------------------------------------------
> | .........
> | ERROR: test-bad-pull output changed
> | --- Expected output
> | +++ Test output
> | @@ -1,4 +1,4 @@
> | -abort: error: Connection refused
> | +abort: error: Network is unreachable

Eek - does Solaris really print that when there's no process listening
on a port (e.g. does something like "telnet localhost 38142" also print
that?  What about "telnet 127.0.0.1 38142"?  Assuming there's nobody
listening on that port...)  Is there any chance you have some firewall
settings that could cause this?

> | ERROR: test-conflict output changed
> | ERROR: test-merge-revert2 output changed
> | ERROR: test-merge7 output changed
> | --- Expected output
> | +++ Test output
> | @@ -6,13 +6,9 @@
> |  adding file changes
> |  added 1 changesets with 1 changes to 1 files (+1 heads)
> |  (run 'hg heads' to see heads, 'hg merge' to merge)
> | -merge: warning: conflicts during merge
> |  merging test.txt
> | -merging test.txt failed!
> | -0 files updated, 0 files merged, 0 files removed, 1 files unresolved
> | -There are unresolved merges, you can redo the full merge using:
> | -  hg update -C 1
> | -  hg merge 2
> | +0 files updated, 1 files merged, 0 files removed, 0 files unresolved
> | +(branch merge, don't forget to commit)

For these guys, it looks like the merge binary exits with success even
if it wasn't able to merge the file... :-/

> | ERROR: test-http-proxy output changed

> | ERROR: test-static-http output changed

Same problem as test-bad-pull

> ,--------------------------------------------------------------------------
> | system:      Solaris
> | version:     Solaris 8 HW 12/02 s28s_hw1wos_06a SPARC
> +--------------------------------------------------------------------------
> | ERROR: test-conflict output changed
> | ERROR: test-merge-revert2 output changed
> | ERROR: test-merge7 output changed

Same problem with merge.

Thanks for doing this.

Alexis