upstream/mercurial-mirror Files · tests/test-http-proxy.t

subrepo: calculate _relpath for hgsubrepo based on self instead of parent...

subrepo: calculate _relpath for hgsubrepo based on self instead of parent Prior to 105758d1b37b, the subrelpath() (now _relpath) for hgsubrepo was calculated by removing the root path of the outermost repo from the root path of the subrepo. Since the root paths use platform specific separators, and the relative path is printed by various commands, the output of these commands require a glob (and check-code.py enforces this). In an effort to be generic to all subrepos, started calculating this path based on the parent repo, and then joining the subrepo path in .hgsub. One of the tests in test-subrepo.t creates a subrepo inside a directory, so the path being joined contained '/' instead of '\'. This made the test fail with a '~' status, because the glob is unnecessary[1]. Removing them made the test work, but then check-code complains. We can't just drop the check-code rule, because sub-subrepos are still joined with '\'. Presumably the other subrepo types have this issue as well, but there likely isn't a test with git or svn repos inside a subdirectory. This simply restores the exact _relpath value (and output) for hgsubrepos prior to 105758d1b37b. [1] http://www.selenic.com/pipermail/mercurial-devel/2015-April/068720.html

Durham Goode - - Load All Authors

File last commit:

r23116:2dc6b791 stable


                r24786:56e15db9

default

Download file

             test-http-proxy.t
        
                    128 lines
            
             | 6.1 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-http-proxy.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
tests: replace exit 80 with #require

              r22046
            
      #require serve

        Matt Mackall
    
tests: unify test-http-proxy

              r12449
            
        $ hg init a

        $ cd a

        $ echo a > a

        $ hg ci -Ama -d '1123456789 0'

        adding a

        $ hg --config server.uncompressed=True serve -p $HGPORT -d --pid-file=hg.pid

        $ cat hg.pid >> $DAEMON_PIDS

        $ cd ..

        Matt Mackall
    
tests: fix startup race in test-http-proxy

              r16301
            
        $ "$TESTDIR/tinyproxy.py" $HGPORT1 localhost >proxy.log 2>&1 </dev/null &

        Mads Kiilerich
    
tests: use 'do sleep 0' instead of 'do true', also on first line of command...

              r16496
            
        $ while [ ! -f proxy.pid ]; do sleep 0; done

        Matt Mackall
    
tests: unify test-http-proxy

              r12449
            
        $ cat proxy.pid >> $DAEMON_PIDS

      url for proxy, stream

        $ http_proxy=http://localhost:$HGPORT1/ hg --config http_proxy.always=True clone --uncompressed http://localhost:$HGPORT/ b

        streaming all changes

        3 files to transfer, 303 bytes of data

        Thomas Arendsen Hein
    
tests: check for (*/sec) instead of (*B/sec) to match (X bytes/sec)...

              r14023
            
        transferred * bytes in * seconds (*/sec) (glob)

        Durham Goode
    
clone: fix copying bookmarks in uncompressed clones (issue4430)...

              r23116
            
        searching for changes

        no changes found

        Matt Mackall
    
tests: unify test-http-proxy

              r12449
            
        updating to branch default

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ cd b

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        1 files, 1 changesets, 1 total revisions

        $ cd ..

      url for proxy, pull

        $ http_proxy=http://localhost:$HGPORT1/ hg --config http_proxy.always=True clone http://localhost:$HGPORT/ b-pull

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        updating to branch default

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ cd b-pull

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        1 files, 1 changesets, 1 total revisions

        $ cd ..

      host:port for proxy

        $ http_proxy=localhost:$HGPORT1 hg clone --config http_proxy.always=True http://localhost:$HGPORT/ c

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        updating to branch default

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

      proxy url with user name and password

        $ http_proxy=http://user:passwd@localhost:$HGPORT1 hg clone --config http_proxy.always=True http://localhost:$HGPORT/ d

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        updating to branch default

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

      url with user name and password

        $ http_proxy=http://user:passwd@localhost:$HGPORT1 hg clone --config http_proxy.always=True http://user:passwd@localhost:$HGPORT/ e

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        updating to branch default

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

      bad host:port for proxy

        $ http_proxy=localhost:$HGPORT2 hg clone --config http_proxy.always=True http://localhost:$HGPORT/ f

        abort: error: Connection refused

        [255]

      do not use the proxy if it is in the no list

        $ http_proxy=localhost:$HGPORT1 hg clone --config http_proxy.no=localhost http://localhost:$HGPORT/ g

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        updating to branch default

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ cat proxy.log

        Mads Kiilerich
    
tests: reintroduce ":$HGPORT" in test output...

              r12643
            
        * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)

        Tomasz Kleczek
    
branchcache: fetch source branchcache during clone (issue3378)...

              r17740
            
        * - - [*] "GET http://localhost:$HGPORT/?cmd=branchmap HTTP/1.1" - - (glob)

        Mads Kiilerich
    
tests: reintroduce ":$HGPORT" in test output...

              r12643
            
        * - - [*] "GET http://localhost:$HGPORT/?cmd=stream_out HTTP/1.1" - - (glob)

        Durham Goode
    
clone: fix copying bookmarks in uncompressed clones (issue4430)...

              r23116
            
        * - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - - x-hgarg-1:namespace=bookmarks (glob)

        * - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D83180e7845de420a1bb46896fd5fe05294f8d629 (glob)

        * - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - - x-hgarg-1:namespace=phases (glob)

        Matt Mackall
    
bookmarks: merge low-level push/pull support into core

              r13364
            
        * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)

        Pierre-Yves David
    
clone: remove duplicated bookmark pulling...

              r22648
            
        *- - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - - x-hgarg-1:namespace=bookmarks (glob)

        *- - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D (glob)

        *- - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629 (glob)

        *- - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - - x-hgarg-1:namespace=phases (glob)

        David Soria Parra
    
bookmarks: separate bookmarks update code from localrepo's pull....

              r13646
            
        * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)

        Pierre-Yves David
    
pull: move bookmark movements inside the `exchange.pull`...

              r22645
            
        * - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - - x-hgarg-1:namespace=bookmarks (glob)

        Peter Arrenbrecht
    
setdiscovery: batch heads and known(ownheads)...

              r14624
            
        * - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D (glob)

        Matt Mackall
    
http: minor tweaks to long arg handling...

              r14094
            
        * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629 (glob)

        Pierre-Yves David
    
phases: exchange phase boundaries on pull...

              r15650
            
        * - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - - x-hgarg-1:namespace=phases (glob)

        Matt Mackall
    
bookmarks: merge low-level push/pull support into core

              r13364
            
        * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)

        Pierre-Yves David
    
pull: move bookmark movements inside the `exchange.pull`...

              r22645
            
        * - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - - x-hgarg-1:namespace=bookmarks (glob)

        Peter Arrenbrecht
    
setdiscovery: batch heads and known(ownheads)...

              r14624
            
        * - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D (glob)

        Matt Mackall
    
http: minor tweaks to long arg handling...

              r14094
            
        * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629 (glob)

        Pierre-Yves David
    
phases: exchange phase boundaries on pull...

              r15650
            
        * - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - - x-hgarg-1:namespace=phases (glob)

        Matt Mackall
    
bookmarks: merge low-level push/pull support into core

              r13364
            
        * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)

        Pierre-Yves David
    
pull: move bookmark movements inside the `exchange.pull`...

              r22645
            
        * - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - - x-hgarg-1:namespace=bookmarks (glob)

        Peter Arrenbrecht
    
setdiscovery: batch heads and known(ownheads)...

              r14624
            
        * - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D (glob)

        Matt Mackall
    
http: minor tweaks to long arg handling...

              r14094
            
        * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629 (glob)

        Pierre-Yves David
    
phases: exchange phase boundaries on pull...

              r15650
            
        * - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - - x-hgarg-1:namespace=phases (glob)

	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
Matt Mackall tests: unify test-http-proxy	r12449
		$ hg init a
		$ cd a
		$ echo a > a
		$ hg ci -Ama -d '1123456789 0'
		adding a
		$ hg --config server.uncompressed=True serve -p $HGPORT -d --pid-file=hg.pid
		$ cat hg.pid >> $DAEMON_PIDS
		$ cd ..
Matt Mackall tests: fix startup race in test-http-proxy	r16301	$ "$TESTDIR/tinyproxy.py" $HGPORT1 localhost >proxy.log 2>&1 </dev/null &
Mads Kiilerich tests: use 'do sleep 0' instead of 'do true', also on first line of command...	r16496	$ while [ ! -f proxy.pid ]; do sleep 0; done
Matt Mackall tests: unify test-http-proxy	r12449	$ cat proxy.pid >> $DAEMON_PIDS

		url for proxy, stream

		$ http_proxy=http://localhost:$HGPORT1/ hg --config http_proxy.always=True clone --uncompressed http://localhost:$HGPORT/ b
		streaming all changes
		3 files to transfer, 303 bytes of data
Thomas Arendsen Hein tests: check for (/sec) instead of (B/sec) to match (X bytes/sec)...	r14023	transferred * bytes in * seconds (*/sec) (glob)
Durham Goode clone: fix copying bookmarks in uncompressed clones (issue4430)...	r23116	searching for changes
		no changes found
Matt Mackall tests: unify test-http-proxy	r12449	updating to branch default
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ cd b
		$ hg verify
		checking changesets
		checking manifests
		crosschecking files in changesets and manifests
		checking files
		1 files, 1 changesets, 1 total revisions
		$ cd ..

		url for proxy, pull

		$ http_proxy=http://localhost:$HGPORT1/ hg --config http_proxy.always=True clone http://localhost:$HGPORT/ b-pull
		requesting all changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files
		updating to branch default
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ cd b-pull
		$ hg verify
		checking changesets
		checking manifests
		crosschecking files in changesets and manifests
		checking files
		1 files, 1 changesets, 1 total revisions
		$ cd ..

		host:port for proxy

		$ http_proxy=localhost:$HGPORT1 hg clone --config http_proxy.always=True http://localhost:$HGPORT/ c
		requesting all changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files
		updating to branch default
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved

		proxy url with user name and password

		$ http_proxy=http://user:passwd@localhost:$HGPORT1 hg clone --config http_proxy.always=True http://localhost:$HGPORT/ d
		requesting all changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files
		updating to branch default
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved

		url with user name and password

		$ http_proxy=http://user:passwd@localhost:$HGPORT1 hg clone --config http_proxy.always=True http://user:passwd@localhost:$HGPORT/ e
		requesting all changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files
		updating to branch default
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved

		bad host:port for proxy

		$ http_proxy=localhost:$HGPORT2 hg clone --config http_proxy.always=True http://localhost:$HGPORT/ f
		abort: error: Connection refused
		[255]

		do not use the proxy if it is in the no list

		$ http_proxy=localhost:$HGPORT1 hg clone --config http_proxy.no=localhost http://localhost:$HGPORT/ g
		requesting all changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files
		updating to branch default
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ cat proxy.log
Mads Kiilerich tests: reintroduce ":$HGPORT" in test output...	r12643	* - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)
Tomasz Kleczek branchcache: fetch source branchcache during clone (issue3378)...	r17740	* - - [*] "GET http://localhost:$HGPORT/?cmd=branchmap HTTP/1.1" - - (glob)
Mads Kiilerich tests: reintroduce ":$HGPORT" in test output...	r12643	* - - [*] "GET http://localhost:$HGPORT/?cmd=stream_out HTTP/1.1" - - (glob)
Durham Goode clone: fix copying bookmarks in uncompressed clones (issue4430)...	r23116	* - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - - x-hgarg-1:namespace=bookmarks (glob)
		* - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D83180e7845de420a1bb46896fd5fe05294f8d629 (glob)
		* - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - - x-hgarg-1:namespace=phases (glob)
Matt Mackall bookmarks: merge low-level push/pull support into core	r13364	* - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)
Pierre-Yves David clone: remove duplicated bookmark pulling...	r22648	- - [] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - - x-hgarg-1:namespace=bookmarks (glob)
		- - [] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D (glob)
		- - [] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629 (glob)
		- - [] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - - x-hgarg-1:namespace=phases (glob)
David Soria Parra bookmarks: separate bookmarks update code from localrepo's pull....	r13646	* - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)
Pierre-Yves David pull: move bookmark movements inside the `exchange.pull`...	r22645	* - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - - x-hgarg-1:namespace=bookmarks (glob)
Peter Arrenbrecht setdiscovery: batch heads and known(ownheads)...	r14624	* - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D (glob)
Matt Mackall http: minor tweaks to long arg handling...	r14094	* - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629 (glob)
Pierre-Yves David phases: exchange phase boundaries on pull...	r15650	* - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - - x-hgarg-1:namespace=phases (glob)
Matt Mackall bookmarks: merge low-level push/pull support into core	r13364	* - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)
Pierre-Yves David pull: move bookmark movements inside the `exchange.pull`...	r22645	* - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - - x-hgarg-1:namespace=bookmarks (glob)
Peter Arrenbrecht setdiscovery: batch heads and known(ownheads)...	r14624	* - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D (glob)
Matt Mackall http: minor tweaks to long arg handling...	r14094	* - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629 (glob)
Pierre-Yves David phases: exchange phase boundaries on pull...	r15650	* - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - - x-hgarg-1:namespace=phases (glob)
Matt Mackall bookmarks: merge low-level push/pull support into core	r13364	* - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)
Pierre-Yves David pull: move bookmark movements inside the `exchange.pull`...	r22645	* - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - - x-hgarg-1:namespace=bookmarks (glob)
Peter Arrenbrecht setdiscovery: batch heads and known(ownheads)...	r14624	* - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D (glob)
Matt Mackall http: minor tweaks to long arg handling...	r14094	* - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629 (glob)
Pierre-Yves David phases: exchange phase boundaries on pull...	r15650	* - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - - x-hgarg-1:namespace=phases (glob)