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

wireprotov2: implement commands as a generator of objects...

wireprotov2: implement commands as a generator of objects Previously, wire protocol version 2 inherited version 1's model of having separate types to represent the results of different wire protocol commands. As I implemented more powerful commands in future commits, I found I was using a common pattern of returning a special type to hold a generator. This meant the command function required a closure to do most of the work. That made logic flow more difficult to follow. I also noticed that many commands were effectively a sequence of objects to be CBOR encoded. I think it makes sense to define version 2 commands as generators. This way, commands can simply emit the data structures they wish to send to the client. This eliminates the need for a closure in command functions and removes encoding from the bodies of commands. As part of this commit, the handling of response objects has been moved into the serverreactor class. This puts the reactor in the driver's seat with regards to CBOR encoding and error handling. Having error handling in the function that emits frames is particularly important because exceptions in that function can lead to things getting in a bad state: I'm fairly certain that uncaught exceptions in the frame generator were causing deadlocks. I also introduced a dedicated error type for explicit error reporting in command handlers. This will be used in subsequent commits. There's still a bit of work to be done here, especially around formalizing the error handling "protocol." I've added yet another TODO to track this so we don't forget. Test output changed because we're using generators and no longer know we are at the end of the data until we hit the end of the generator. This means we can't emit the end-of-stream flag until we've exhausted the generator. Hence the introduction of 0-sized end-of-stream frames. Differential Revision: https://phab.mercurial-scm.org/D4472

Gregory Szorc - - Load All Authors

File last commit:

r37865:89793289 default


                r39595:07b58266

default

Download file

             test-serve.t
        
                    102 lines
            
             | 2.4 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-serve.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
tests: replace exit 80 with #require

              r22046
            
      #require serve

        Patrick Mezard
    
tests: convert test-serve to new format

              r13540
            
        $ 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\//'

        Gregory Szorc
    
tests: remove pid file by default...

              r37865
            
        >    if [ -f hg.pid ]; then

        >        killdaemons.py hg.pid

        >    fi

        Patrick Mezard
    
tests: convert test-serve to new format

              r13540
            
        >    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

        Mads Kiilerich
    
tests: fix incorrect markup of continued lines of sh commands

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

        > fi

        Patrick Mezard
    
tests: convert test-serve to new format

              r13540
            
        access log created - .hg/hgrc respected

      errors

        $ cat errors.log

      With -v

        $ hgserve

        Matt Harbison
    
test-serve: make the 'listening at *' lines optional...

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

        Patrick Mezard
    
tests: convert test-serve to new format

              r13540
            
        % errors

      With -v and -p HGPORT2

        $ hgserve -p "$HGPORT2"

        Matt Harbison
    
test-serve: make the 'listening at *' lines optional...

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

        Patrick Mezard
    
tests: convert test-serve to new format

              r13540
            
        % errors

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

        Matt Harbison
    
test-serve: disable unfixable tests on Windows...

              r31771
            
      #if no-root no-windows

        Patrick Mezard
    
tests: convert test-serve to new format

              r13540
            
        $ KILLQUIETLY=Y

        $ hgserve -p daytime

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

        abort: child process failed to start

        % errors

        $ KILLQUIETLY=N

        Matt Mackall
    
tests: skip tests that require not having root (issue4089)...

              r20008
            
      #endif

        Patrick Mezard
    
tests: convert test-serve to new format

              r13540
            
      With --prefix foo

        $ hgserve --prefix foo

        Matt Harbison
    
test-serve: make the 'listening at *' lines optional...

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

        Patrick Mezard
    
tests: convert test-serve to new format

              r13540
            
        % errors

      With --prefix /foo

        $ hgserve --prefix /foo

        Matt Harbison
    
test-serve: make the 'listening at *' lines optional...

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

        Patrick Mezard
    
tests: convert test-serve to new format

              r13540
            
        % errors

      With --prefix foo/

        $ hgserve --prefix foo/

        Matt Harbison
    
test-serve: make the 'listening at *' lines optional...

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

        Patrick Mezard
    
tests: convert test-serve to new format

              r13540
            
        % errors

      With --prefix /foo/

        $ hgserve --prefix /foo/

        Matt Harbison
    
test-serve: make the 'listening at *' lines optional...

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

        Patrick Mezard
    
tests: convert test-serve to new format

              r13540
            
        % errors

        Mads Kiilerich
    
tests: add missing trailing 'cd ..'...

              r16913
            
        Matt Harbison
    
server: ensure the incoming request falls under the prefix value...

              r37288
            
        $ $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)

        Mads Kiilerich
    
tests: add missing trailing 'cd ..'...

              r16913
            
        $ 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

Matt Mackall tests: replace exit 80 with #require	r22046	#require serve
Patrick Mezard tests: convert test-serve to new format	r13540
		$ 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\//'
Gregory Szorc tests: remove pid file by default...	r37865	> if [ -f hg.pid ]; then
		> killdaemons.py hg.pid
		> fi
Patrick Mezard tests: convert test-serve to new format	r13540	> 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
Mads Kiilerich tests: fix incorrect markup of continued lines of sh commands	r16487	> echo 'access log created - .hg/hgrc respected'
		> fi
Patrick Mezard tests: convert test-serve to new format	r13540	access log created - .hg/hgrc respected

		errors

		$ cat errors.log

		With -v

		$ hgserve
Matt Harbison test-serve: make the 'listening at *' lines optional...	r31769	listening at http://localhost/ (bound to $LOCALIP:HGPORT1) (glob) (?)
Patrick Mezard tests: convert test-serve to new format	r13540	% errors

		With -v and -p HGPORT2

		$ hgserve -p "$HGPORT2"
Matt Harbison test-serve: make the 'listening at *' lines optional...	r31769	listening at http://localhost/ (bound to $LOCALIP:HGPORT2) (glob) (?)
Patrick Mezard tests: convert test-serve to new format	r13540	% errors

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

Matt Harbison test-serve: disable unfixable tests on Windows...	r31771	#if no-root no-windows
Patrick Mezard tests: convert test-serve to new format	r13540	$ KILLQUIETLY=Y
		$ hgserve -p daytime
		abort: cannot start server at 'localhost:13': Permission denied
		abort: child process failed to start
		% errors
		$ KILLQUIETLY=N
Matt Mackall tests: skip tests that require not having root (issue4089)...	r20008	#endif
Patrick Mezard tests: convert test-serve to new format	r13540
		With --prefix foo

		$ hgserve --prefix foo
Matt Harbison test-serve: make the 'listening at *' lines optional...	r31769	listening at http://localhost/foo/ (bound to $LOCALIP:HGPORT1) (glob) (?)
Patrick Mezard tests: convert test-serve to new format	r13540	% errors

		With --prefix /foo

		$ hgserve --prefix /foo
Matt Harbison test-serve: make the 'listening at *' lines optional...	r31769	listening at http://localhost/foo/ (bound to $LOCALIP:HGPORT1) (glob) (?)
Patrick Mezard tests: convert test-serve to new format	r13540	% errors

		With --prefix foo/

		$ hgserve --prefix foo/
Matt Harbison test-serve: make the 'listening at *' lines optional...	r31769	listening at http://localhost/foo/ (bound to $LOCALIP:HGPORT1) (glob) (?)
Patrick Mezard tests: convert test-serve to new format	r13540	% errors

		With --prefix /foo/

		$ hgserve --prefix /foo/
Matt Harbison test-serve: make the 'listening at *' lines optional...	r31769	listening at http://localhost/foo/ (bound to $LOCALIP:HGPORT1) (glob) (?)
Patrick Mezard tests: convert test-serve to new format	r13540	% errors
Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913
Matt Harbison server: ensure the incoming request falls under the prefix value...	r37288	$ $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)

Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913	$ cd ..