upstream/mercurial-mirror Files · tests/test-serve.t

errors: catch urllib errors specifically instead of using safehasattr()...

errors: catch urllib errors specifically instead of using safehasattr() Before this patch, we would catch `IOError` and `OSError` and check if the instance had a `.code` member (indicates `HTTPError`) or a `.reason` member (indicates the more generic `URLError`). It seems to me that can simply catch those exception specifically instead, so that's what this code does. The existing code is from (commands: report http exceptions nicely, 2005-06-17), so I suspect it's just that there was no `urllib2` (where `URLError` lives) back then. The old code mentioned `SSLError` in a comment. The new code does *not* try to catch that. The documentation for `ssl.SSLError` says that it has a `.reason` property, but `python -c 'import ssl; print(dir(ssl.SSLError("foo", Exception("bar"))))` doesn't mention that property on either Python 2 or Python 3 on my system. It also seems that `sslutil` is pretty careful about converting `ssl.SSLError` to `error.Abort`. It also is carefult to not assume that instances of the exception have a `.reason`. So I at least don't want to catch `ssl.SSLError` and handle it the same way as `URLError` because that would likely result in a crash. I also wonder if we don't need to handle it at all (because `sslutil` might handle all the cases). It's now early in the release cycle, so perhaps we can just see how it goes? Differential Revision: https://phab.mercurial-scm.org/D9318

Matt Harbison - - Load All Authors

File last commit:

r45613:8c06f479 default


                r46442:ae00e170

default

Download file

             test-serve.t
        
                    112 lines
            
             | 2.7 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-serve.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require serve

        $ hgserve()

        > {

        >    hg serve -a localhost -d --pid-file=hg.pid -E errors.log -v $@ \

        >        | sed -e "s/:$HGPORT1\\([^0-9]\\)/:HGPORT1\1/g" \

        >              -e "s/:$HGPORT2\\([^0-9]\\)/:HGPORT2\1/g" \

        >              -e 's/http:\/\/[^/]*\//http:\/\/localhost\//'

        >    if [ -f hg.pid ]; then

        >        killdaemons.py hg.pid

        >    fi

        >    echo % errors

        >    cat errors.log

        > }

        $ hg init test

        $ cd test

        $ echo '[web]' > .hg/hgrc

        $ echo 'accesslog = access.log' >> .hg/hgrc

        $ echo "port = $HGPORT1" >> .hg/hgrc

      Without -v

        $ hg serve -a localhost -p $HGPORT -d --pid-file=hg.pid -E errors.log

        $ cat hg.pid >> "$DAEMON_PIDS"

        $ if [ -f access.log ]; then

        >     echo 'access log created - .hg/hgrc respected'

        > fi

        access log created - .hg/hgrc respected

      errors

        $ cat errors.log

      With -v

        $ hgserve

        listening at http://localhost/ (bound to *$LOCALIP*:HGPORT1) (glob) (?)

        % errors

      With -v and -p HGPORT2

        $ hgserve -p "$HGPORT2"

        listening at http://localhost/ (bound to *$LOCALIP*:HGPORT2) (glob) (?)

        % errors

      With -v and -p daytime (should fail because low port)

      #if no-root no-windows

        $ KILLQUIETLY=Y

        $ hgserve -p daytime

        abort: cannot start server at 'localhost:13': Permission denied

        abort: child process failed to start

        % errors

        $ KILLQUIETLY=N

      #endif

      With --prefix foo

        $ hgserve --prefix foo

        listening at http://localhost/foo/ (bound to *$LOCALIP*:HGPORT1) (glob) (?)

        % errors

      With --prefix /foo

        $ hgserve --prefix /foo

        listening at http://localhost/foo/ (bound to *$LOCALIP*:HGPORT1) (glob) (?)

        % errors

      With --prefix foo/

        $ hgserve --prefix foo/

        listening at http://localhost/foo/ (bound to *$LOCALIP*:HGPORT1) (glob) (?)

        % errors

      With --prefix /foo/

        $ hgserve --prefix /foo/

        listening at http://localhost/foo/ (bound to *$LOCALIP*:HGPORT1) (glob) (?)

        % errors

        $ "$PYTHON" $RUNTESTDIR/killdaemons.py $DAEMON_PIDS

      With out of bounds accesses

        $ rm access.log

        $ hg serve -a localhost -p $HGPORT -d --prefix some/dir \

        >    --pid-file=hg.pid -E errors.log

        $ cat hg.pid >> "$DAEMON_PIDS"

        $ hg id http://localhost:$HGPORT/some/dir7

        abort: HTTP Error 404: Not Found

        [255]

        $ hg id http://localhost:$HGPORT/some

        abort: HTTP Error 404: Not Found

        [255]

        $ cat access.log errors.log

        $LOCALIP - - [$LOGDATE$] "GET /some/dir7?cmd=capabilities HTTP/1.1" 404 - (glob)

        $LOCALIP - - [$LOGDATE$] "GET /some?cmd=capabilities HTTP/1.1" 404 - (glob)

        $ "$PYTHON" $RUNTESTDIR/killdaemons.py $DAEMON_PIDS

      issue6362: Previously, this crashed on Python 3

        $ hg serve -a 0.0.0.0 -d --pid-file=hg.pid

        listening at http://*:$HGPORT1/ (bound to *:$HGPORT1) (glob) (?)

        $ cat hg.pid > "$DAEMON_PIDS"

        $ "$PYTHON" $RUNTESTDIR/killdaemons.py $DAEMON_PIDS

        $ cd ..

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				#require serve

				$ hgserve()
				> {
				> hg serve -a localhost -d --pid-file=hg.pid -E errors.log -v $@ \
				> \| sed -e "s/:$HGPORT1\\([^0-9]\\)/:HGPORT1\1/g" \
				> -e "s/:$HGPORT2\\([^0-9]\\)/:HGPORT2\1/g" \
				> -e 's/http:\/\/[^/]*\//http:\/\/localhost\//'
				> if [ -f hg.pid ]; then
				> killdaemons.py hg.pid
				> fi
				> echo % errors
				> cat errors.log
				> }

				$ hg init test
				$ cd test
				$ echo '[web]' > .hg/hgrc
				$ echo 'accesslog = access.log' >> .hg/hgrc
				$ echo "port = $HGPORT1" >> .hg/hgrc

				Without -v

				$ hg serve -a localhost -p $HGPORT -d --pid-file=hg.pid -E errors.log
				$ cat hg.pid >> "$DAEMON_PIDS"
				$ if [ -f access.log ]; then
				> echo 'access log created - .hg/hgrc respected'
				> fi
				access log created - .hg/hgrc respected

				errors

				$ cat errors.log

				With -v

				$ hgserve
				listening at http://localhost/ (bound to $LOCALIP:HGPORT1) (glob) (?)
				% errors

				With -v and -p HGPORT2

				$ hgserve -p "$HGPORT2"
				listening at http://localhost/ (bound to $LOCALIP:HGPORT2) (glob) (?)
				% errors

				With -v and -p daytime (should fail because low port)

				#if no-root no-windows
				$ KILLQUIETLY=Y
				$ hgserve -p daytime
				abort: cannot start server at 'localhost:13': Permission denied
				abort: child process failed to start
				% errors
				$ KILLQUIETLY=N
				#endif

				With --prefix foo

				$ hgserve --prefix foo
				listening at http://localhost/foo/ (bound to $LOCALIP:HGPORT1) (glob) (?)
				% errors

				With --prefix /foo

				$ hgserve --prefix /foo
				listening at http://localhost/foo/ (bound to $LOCALIP:HGPORT1) (glob) (?)
				% errors

				With --prefix foo/

				$ hgserve --prefix foo/
				listening at http://localhost/foo/ (bound to $LOCALIP:HGPORT1) (glob) (?)
				% errors

				With --prefix /foo/

				$ hgserve --prefix /foo/
				listening at http://localhost/foo/ (bound to $LOCALIP:HGPORT1) (glob) (?)
				% errors

				$ "$PYTHON" $RUNTESTDIR/killdaemons.py $DAEMON_PIDS

				With out of bounds accesses

				$ rm access.log
				$ hg serve -a localhost -p $HGPORT -d --prefix some/dir \
				> --pid-file=hg.pid -E errors.log
				$ cat hg.pid >> "$DAEMON_PIDS"

				$ hg id http://localhost:$HGPORT/some/dir7
				abort: HTTP Error 404: Not Found
				[255]
				$ hg id http://localhost:$HGPORT/some
				abort: HTTP Error 404: Not Found
				[255]

				$ cat access.log errors.log
				$LOCALIP - - [$LOGDATE$] "GET /some/dir7?cmd=capabilities HTTP/1.1" 404 - (glob)
				$LOCALIP - - [$LOGDATE$] "GET /some?cmd=capabilities HTTP/1.1" 404 - (glob)

				$ "$PYTHON" $RUNTESTDIR/killdaemons.py $DAEMON_PIDS

				issue6362: Previously, this crashed on Python 3

				$ hg serve -a 0.0.0.0 -d --pid-file=hg.pid
				listening at http://:$HGPORT1/ (bound to :$HGPORT1) (glob) (?)

				$ cat hg.pid > "$DAEMON_PIDS"
				$ "$PYTHON" $RUNTESTDIR/killdaemons.py $DAEMON_PIDS

				$ cd ..