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

sshpeer: store subprocess so it cleans up correctly...

sshpeer: store subprocess so it cleans up correctly When running 'hg pull --rebase', I was seeing this exception 100% of the time as the python process was closing down: Exception TypeError: TypeError("'NoneType' object is not callable",) in <bound method Popen.__del__ of <subprocess.Popen object at 0x937c10>> ignored By storing the subprocess on the sshpeer, the subprocess seems to clean up correctly, and I no longer see the exception. I have no idea why this actually works, but I get a 0% repro if I store the subprocess in self.subprocess, and a 100% repro if I store None in self.subprocess. Possibly related to issue 2240.

Simon Heimberg - - Load All Authors

File last commit:

r18720:0ade08dc default


                r18759:9baf4330

default

Download file

             test-blackbox.t
        
                    79 lines
            
             | 2.1 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-blackbox.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      setup

        $ cat > mock.py <<EOF

        > from mercurial import util

        > import getpass

        > 

        > def makedate():

        >     return 0, 0

        > def getuser():

        >     return 'bob'

        > # mock the date and user apis so the output is always the same

        > def uisetup(ui):

        >     util.makedate = makedate

        >     getpass.getuser = getuser

        > EOF

        $ cat >> $HGRCPATH <<EOF

        > [extensions]

        > blackbox=

        > mock=`pwd`/mock.py

        > EOF

        $ hg init blackboxtest

        $ cd blackboxtest

      command, exit codes, and duration

        $ echo a > a

        $ hg add a

        $ hg blackbox

        1970/01/01 00:00:00 bob> add a

        1970/01/01 00:00:00 bob> add exited 0 after * seconds (glob)

      incoming change tracking

      create two heads to verify that we only see one change in the log later

        $ hg commit -ma

        $ hg up null

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

        $ echo b > b

        $ hg commit -Amb

        adding b

        created new head

      clone, commit, pull

        $ hg clone . ../blackboxtest2

        updating to branch default

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

        $ echo c > c

        $ hg commit -Amc

        adding c

        $ cd ../blackboxtest2

        $ hg pull

        pulling from $TESTTMP/blackboxtest (glob)

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        (run 'hg update' to get a working copy)

        $ hg blackbox -l 3

        1970/01/01 00:00:00 bob> pull

        1970/01/01 00:00:00 bob> 1 incoming changes - new heads: d02f48003e62

        1970/01/01 00:00:00 bob> pull exited None after * seconds (glob)

      extension and python hooks - use the eol extension for a pythonhook

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

        $ echo 'eol=' >> .hg/hgrc

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

        $ echo 'update = echo hooked' >> .hg/hgrc

        $ hg update

        hooked

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

        $ hg blackbox -l 4

        1970/01/01 00:00:00 bob> update

        1970/01/01 00:00:00 bob> pythonhook-preupdate: hgext.eol.preupdate finished in * seconds (glob)

        1970/01/01 00:00:00 bob> exthook-update: echo hooked finished in * seconds (glob)

        1970/01/01 00:00:00 bob> update exited False after * seconds (glob)

      cleanup

        $ 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

				setup
				$ cat > mock.py <<EOF
				> from mercurial import util
				> import getpass
				>
				> def makedate():
				> return 0, 0
				> def getuser():
				> return 'bob'
				> # mock the date and user apis so the output is always the same
				> def uisetup(ui):
				> util.makedate = makedate
				> getpass.getuser = getuser
				> EOF
				$ cat >> $HGRCPATH <<EOF
				> [extensions]
				> blackbox=
				> mock=`pwd`/mock.py
				> EOF
				$ hg init blackboxtest
				$ cd blackboxtest

				command, exit codes, and duration

				$ echo a > a
				$ hg add a
				$ hg blackbox
				1970/01/01 00:00:00 bob> add a
				1970/01/01 00:00:00 bob> add exited 0 after * seconds (glob)

				incoming change tracking

				create two heads to verify that we only see one change in the log later
				$ hg commit -ma
				$ hg up null
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ echo b > b
				$ hg commit -Amb
				adding b
				created new head

				clone, commit, pull
				$ hg clone . ../blackboxtest2
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ echo c > c
				$ hg commit -Amc
				adding c
				$ cd ../blackboxtest2
				$ hg pull
				pulling from $TESTTMP/blackboxtest (glob)
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files
				(run 'hg update' to get a working copy)
				$ hg blackbox -l 3
				1970/01/01 00:00:00 bob> pull
				1970/01/01 00:00:00 bob> 1 incoming changes - new heads: d02f48003e62
				1970/01/01 00:00:00 bob> pull exited None after * seconds (glob)

				extension and python hooks - use the eol extension for a pythonhook

				$ echo '[extensions]' >> .hg/hgrc
				$ echo 'eol=' >> .hg/hgrc
				$ echo '[hooks]' >> .hg/hgrc
				$ echo 'update = echo hooked' >> .hg/hgrc
				$ hg update
				hooked
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg blackbox -l 4
				1970/01/01 00:00:00 bob> update
				1970/01/01 00:00:00 bob> pythonhook-preupdate: hgext.eol.preupdate finished in * seconds (glob)
				1970/01/01 00:00:00 bob> exthook-update: echo hooked finished in * seconds (glob)
				1970/01/01 00:00:00 bob> update exited False after * seconds (glob)

				cleanup
				$ cd ..