upstream/mercurial-mirror Files · contrib/Makefile.python

dummysmtpd: don't die on client connection errors...

dummysmtpd: don't die on client connection errors The connection refused error in test-patchbomb-tls.t[1] is sporadic, but one of the more often seen errors on Windows. I added enough logging to a file and dumped it out at the end to make the following observations: - The listening socket is successfully created and bound to the port, and the "listening at..." message is always logged. - Generally, the following is the entire log output, with the "accepted ..." message having been added after `sslutil.wrapserversocket`: listening at localhost:$HGPORT $LOCALIP ssl error accepted connect accepted connect $LOCALIP from=quux to=foo, bar $LOCALIP ssl error - In the cases that fail, asyncore.loop() in the run() method is exiting, but not with an exception. - In the cases that fail, the following is logged right after "listening ...": Traceback (most recent call last): File "c:\\Python27\\lib\\asyncore.py", line 83, in read obj.handle_read_event() File "c:\\Python27\\lib\\asyncore.py", line 443, in handle_read_event self.handle_accept() File "../tests/dummysmtpd.py", line 80, in handle_accept conn = sslutil.wrapserversocket(conn, ui, certfile=self._certfile) File "..\\mercurial\\sslutil.py", line 570, in wrapserversocket return sslcontext.wrap_socket(sock, server_side=True) File "c:\\Python27\\lib\\ssl.py", line 363, in wrap_socket _context=self) File "c:\\Python27\\lib\\ssl.py", line 611, in __init__ self.do_handshake() File "c:\\Python27\\lib\\ssl.py", line 840, in do_handshake self._sslobj.do_handshake() error: [Errno 10054] $ECONNRESET$ - If the base class handler is overridden completely, the the first "ssl error" line is replaced by the stacktrace, but the other lines are unchanged. The client behaves no differently, whether or not the server stacktraced. In general, `./run-tests.py --local -j9 -t9000 test-patchbomb-tls.t --runs-per-test 20` would show the issue after a run or two. With this change, `./run-tests.py --local -j9 -t9000 test-patchbomb-tls.t --loop` ran 800 times without a hiccup. This makes me wonder if the other connection refused messages that bubble up on occasion are caused by a similar issue. It seems a bit drastic to kill the whole server on account of a single communication failure with a client. # no-check-commit because of handle_error() [1] https://buildbot.mercurial-scm.org/builders/Win7%20x86_64%20hg%20tests/builds/421/steps/run-tests.py%20%28python%202.7.13%29/logs/stdio

Yuya Nishihara - - Load All Authors

File last commit:

r27230:9f8b8c4e default


                r35794:75bae697

default

Download file

             Makefile.python
        
                    76 lines
            
             | 3.1 KiB
            
                | text/x-makefile
            
             |
                MakefileLexer
            
             / contrib / Makefile.python
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      PYTHONVER=2.7.10

      PYTHONNAME=python-

      PREFIX=$(HOME)/bin/prefix-$(PYTHONNAME)$(PYTHONVER)

      SYMLINKDIR=$(HOME)/bin

      help:

      	@echo

      	@echo 'Make a custom installation of a Python version'

      	@echo

      	@echo 'Common make parameters:'

      	@echo '  PYTHONVER=...    [$(PYTHONVER)]'

      	@echo '  PREFIX=...       [$(PREFIX)]'

      	@echo '  SYMLINKDIR=...   [$(SYMLINKDIR) creating $(PYTHONNAME)$(PYTHONVER)]'

      	@echo

      	@echo 'Common make targets:'

      	@echo '  python    - install Python $$PYTHONVER in $$PREFIX'

      	@echo '  symlink   - create a $$SYMLINKDIR/$(PYTHONNAME)$$PYTHONVER symlink'

      	@echo

      	@echo 'Example: create a temporary Python installation:'

      	@echo '  $$ make -f Makefile.python python PYTHONVER=${PYTHONVER} PREFIX=/tmp/p27'

      	@echo '  $$ /tmp/p27/bin/python -V'

      	@echo '  Python 2.7'

      	@echo

      	@echo 'Some external libraries are required for building Python: zlib bzip2 openssl.'

      	@echo 'Make sure their development packages are installed systemwide.'

      # fedora: yum install zlib-devel bzip2-devel openssl-devel

      # debian: apt-get install zlib1g-dev libbz2-dev libssl-dev

      	@echo

      	@echo 'To build a nice collection of interesting Python versions:'

      	@echo '  $$ for v in 2.{6{,.1,.2,.9},7{,.8,.10}}; do'

      	@echo '    make -f Makefile.python symlink PYTHONVER=$$v || break; done'

      	@echo 'To run a Mercurial test on all these Python versions:'

      	@echo '  $$ for py in `cd ~/bin && ls $(PYTHONNAME)2.*`; do'

      	@echo '    echo $$py; $$py run-tests.py test-http.t; echo; done'

      	@echo

      export LANGUAGE=C

      export LC_ALL=C

      python: $(PREFIX)/bin/python docutils

      	printf 'import sys, zlib, bz2, docutils, ssl' | $(PREFIX)/bin/python

      PYTHON_SRCDIR=Python-$(PYTHONVER)

      PYTHON_SRCFILE=$(PYTHON_SRCDIR).tgz

      $(PREFIX)/bin/python:

      	[ -f $(PYTHON_SRCFILE) ] || wget http://www.python.org/ftp/python/$(PYTHONVER)/$(PYTHON_SRCFILE) || curl -OL http://www.python.org/ftp/python/$(PYTHONVER)/$(PYTHON_SRCFILE) || [ -f $(PYTHON_SRCFILE) ]

      	rm -rf $(PYTHON_SRCDIR)

      	tar xf $(PYTHON_SRCFILE)

      	# Debian/Ubuntu disables SSLv2,3 the hard way, disable it on old Pythons too

      	-sed -i 's,self.*SSLv[23]_method(),0;//\0,g' $(PYTHON_SRCDIR)/Modules/_ssl.c

      	# Find multiarch system libraries on Ubuntu and disable fortify error when setting argv

      	LDFLAGS="-L/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`"; \

      	BASECFLAGS=-U_FORTIFY_SOURCE; \

      	export LDFLAGS BASECFLAGS; \

      	cd $(PYTHON_SRCDIR) && ./configure --prefix=$(PREFIX) && make all SVNVERSION=pwd && make install

      	printf 'import sys, zlib, bz2, ssl' | $(PREFIX)/bin/python

      	rm -rf $(PYTHON_SRCDIR)

      DOCUTILSVER=0.12

      DOCUTILS_SRCDIR=docutils-$(DOCUTILSVER)

      DOCUTILS_SRCFILE=$(DOCUTILS_SRCDIR).tar.gz

      docutils: $(PREFIX)/bin/python

      	@$(PREFIX)/bin/python -c 'import docutils' || ( set -ex; \

      	[ -f $(DOCUTILS_SRCFILE) ] || wget http://downloads.sourceforge.net/project/docutils/docutils/$(DOCUTILSVER)/$(DOCUTILS_SRCFILE) || [ -f $(DOCUTILS_SRCFILE) ]; \

      	rm -rf $(DOCUTILS_SRCDIR); \

      	tar xf $(DOCUTILS_SRCFILE); \

      	cd $(DOCUTILS_SRCDIR) && $(PREFIX)/bin/python setup.py install --prefix=$(PREFIX); \

      	$(PREFIX)/bin/python -c 'import docutils'; \

      	rm -rf $(DOCUTILS_SRCDIR); )

      symlink: python $(SYMLINKDIR)

      	ln -sf $(PREFIX)/bin/python $(SYMLINKDIR)/$(PYTHONNAME)$(PYTHONVER)

      .PHONY: help python docutils symlink

	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

				PYTHONVER=2.7.10
				PYTHONNAME=python-
				PREFIX=$(HOME)/bin/prefix-$(PYTHONNAME)$(PYTHONVER)
				SYMLINKDIR=$(HOME)/bin

				help:
				@echo
				@echo 'Make a custom installation of a Python version'
				@echo
				@echo 'Common make parameters:'
				@echo ' PYTHONVER=... [$(PYTHONVER)]'
				@echo ' PREFIX=... [$(PREFIX)]'
				@echo ' SYMLINKDIR=... [$(SYMLINKDIR) creating $(PYTHONNAME)$(PYTHONVER)]'
				@echo
				@echo 'Common make targets:'
				@echo ' python - install Python $$PYTHONVER in $$PREFIX'
				@echo ' symlink - create a $$SYMLINKDIR/$(PYTHONNAME)$$PYTHONVER symlink'
				@echo
				@echo 'Example: create a temporary Python installation:'
				@echo ' $$ make -f Makefile.python python PYTHONVER=${PYTHONVER} PREFIX=/tmp/p27'
				@echo ' $$ /tmp/p27/bin/python -V'
				@echo ' Python 2.7'
				@echo
				@echo 'Some external libraries are required for building Python: zlib bzip2 openssl.'
				@echo 'Make sure their development packages are installed systemwide.'
				# fedora: yum install zlib-devel bzip2-devel openssl-devel
				# debian: apt-get install zlib1g-dev libbz2-dev libssl-dev
				@echo
				@echo 'To build a nice collection of interesting Python versions:'
				@echo ' $$ for v in 2.{6{,.1,.2,.9},7{,.8,.10}}; do'
				@echo ' make -f Makefile.python symlink PYTHONVER=$$v \|\| break; done'
				@echo 'To run a Mercurial test on all these Python versions:'
				@echo ' $$ for py in `cd ~/bin && ls $(PYTHONNAME)2.*`; do'
				@echo ' echo $$py; $$py run-tests.py test-http.t; echo; done'
				@echo

				export LANGUAGE=C
				export LC_ALL=C

				python: $(PREFIX)/bin/python docutils
				printf 'import sys, zlib, bz2, docutils, ssl' \| $(PREFIX)/bin/python

				PYTHON_SRCDIR=Python-$(PYTHONVER)
				PYTHON_SRCFILE=$(PYTHON_SRCDIR).tgz

				$(PREFIX)/bin/python:
				[ -f $(PYTHON_SRCFILE) ] \|\| wget http://www.python.org/ftp/python/$(PYTHONVER)/$(PYTHON_SRCFILE) \|\| curl -OL http://www.python.org/ftp/python/$(PYTHONVER)/$(PYTHON_SRCFILE) \|\| [ -f $(PYTHON_SRCFILE) ]
				rm -rf $(PYTHON_SRCDIR)
				tar xf $(PYTHON_SRCFILE)
				# Debian/Ubuntu disables SSLv2,3 the hard way, disable it on old Pythons too
				-sed -i 's,self.*SSLv[23]_method(),0;//\0,g' $(PYTHON_SRCDIR)/Modules/_ssl.c
				# Find multiarch system libraries on Ubuntu and disable fortify error when setting argv
				LDFLAGS="-L/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`"; \
				BASECFLAGS=-U_FORTIFY_SOURCE; \
				export LDFLAGS BASECFLAGS; \
				cd $(PYTHON_SRCDIR) && ./configure --prefix=$(PREFIX) && make all SVNVERSION=pwd && make install
				printf 'import sys, zlib, bz2, ssl' \| $(PREFIX)/bin/python
				rm -rf $(PYTHON_SRCDIR)

				DOCUTILSVER=0.12
				DOCUTILS_SRCDIR=docutils-$(DOCUTILSVER)
				DOCUTILS_SRCFILE=$(DOCUTILS_SRCDIR).tar.gz

				docutils: $(PREFIX)/bin/python
				@$(PREFIX)/bin/python -c 'import docutils' \|\| ( set -ex; \
				[ -f $(DOCUTILS_SRCFILE) ] \|\| wget http://downloads.sourceforge.net/project/docutils/docutils/$(DOCUTILSVER)/$(DOCUTILS_SRCFILE) \|\| [ -f $(DOCUTILS_SRCFILE) ]; \
				rm -rf $(DOCUTILS_SRCDIR); \
				tar xf $(DOCUTILS_SRCFILE); \
				cd $(DOCUTILS_SRCDIR) && $(PREFIX)/bin/python setup.py install --prefix=$(PREFIX); \
				$(PREFIX)/bin/python -c 'import docutils'; \
				rm -rf $(DOCUTILS_SRCDIR); )

				symlink: python $(SYMLINKDIR)
				ln -sf $(PREFIX)/bin/python $(SYMLINKDIR)/$(PYTHONNAME)$(PYTHONVER)

				.PHONY: help python docutils symlink