Merge lp:~vila/bzr/fixing-tarmac into lp:~bzr-pqm/bzr/test-tarmac

Proposed by Vincent Ladeuil on 2016-07-26
Status: Merged
Approved by: Vincent Ladeuil on 2016-08-01
Approved revision: 6624
Merge reported by: bzr PQM
Merged at revision: not available
Proposed branch: lp:~vila/bzr/fixing-tarmac
Merge into: lp:~bzr-pqm/bzr/test-tarmac
Diff against target: 98 lines (+34/-5)
4 files modified
Makefile (+1/-1)
bzrlib/transport/sftp.py (+12/-4)
ols-vms.conf (+13/-0)
tools/setup-testbed (+8/-0)
To merge this branch: bzr merge lp:~vila/bzr/fixing-tarmac
Reviewer Review Type Date Requested Status
Vincent Ladeuil Approve on 2016-07-26
Review via email: mp+301194@code.launchpad.net

Commit message

This should only land in lp:~bzr-pqm/bzr/test-tarmac

Description of the change

Testing tarmac, no review needed, thanks anyway ;)

To post a comment you must log in.
Vincent Ladeuil (vila) :
review: Approve
bzr PQM (bzr-pqm) wrote :

The attempt to merge lp:~vila/bzr/fixing-tarmac into lp:~bzr-pqm/bzr/test-tarmac failed. Below is the output from the failed tests.

Warning: Permanently added '10.0.8.174' (ECDSA) to the list of known hosts.
/bin/sh: 1: make: not found

bzr PQM (bzr-pqm) wrote :
Download full text (23.6 KiB)

The attempt to merge lp:~vila/bzr/fixing-tarmac into lp:~bzr-pqm/bzr/test-tarmac failed. Below is the output from the failed tests.

building extension modules.
python setup.py build_ext -i
No Cython, trying Pyrex...
running build_ext
pyrexc bzrlib/_annotator_pyx.pyx --> bzrlib/_annotator_pyx.c
building 'bzrlib._annotator_pyx' extension
creating build
creating build/temp.linux-x86_64-2.7
creating build/temp.linux-x86_64-2.7/bzrlib
x86_64-linux-gnu-gcc -pthread -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -fno-strict-aliasing -Wdate-time -D_FORTIFY_SOURCE=2 -g -fstack-protector-strong -Wformat -Werror=format-security -fPIC -I/usr/include/python2.7 -c bzrlib/_annotator_pyx.c -o build/temp.linux-x86_64-2.7/bzrlib/_annotator_pyx.o
x86_64-linux-gnu-gcc -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions -Wl,-Bsymbolic-functions -Wl,-z,relro -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -Wdate-time -D_FORTIFY_SOURCE=2 -g -fstack-protector-strong -Wformat -Werror=format-security -Wl,-Bsymbolic-functions -Wl,-z,relro -Wdate-time -D_FORTIFY_SOURCE=2 -g -fstack-protector-strong -Wformat -Werror=format-security build/temp.linux-x86_64-2.7/bzrlib/_annotator_pyx.o -o /home/ubuntu/tarmac-testing/bzrlib/_annotator_pyx.so
pyrexc bzrlib/_bencode_pyx.pyx --> bzrlib/_bencode_pyx.c
building 'bzrlib._bencode_pyx' extension
x86_64-linux-gnu-gcc -pthread -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -fno-strict-aliasing -Wdate-time -D_FORTIFY_SOURCE=2 -g -fstack-protector-strong -Wformat -Werror=format-security -fPIC -I/usr/include/python2.7 -c bzrlib/_bencode_pyx.c -o build/temp.linux-x86_64-2.7/bzrlib/_bencode_pyx.o
x86_64-linux-gnu-gcc -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions -Wl,-Bsymbolic-functions -Wl,-z,relro -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -Wdate-time -D_FORTIFY_SOURCE=2 -g -fstack-protector-strong -Wformat -Werror=format-security -Wl,-Bsymbolic-functions -Wl,-z,relro -Wdate-time -D_FORTIFY_SOURCE=2 -g -fstack-protector-strong -Wformat -Werror=format-security build/temp.linux-x86_64-2.7/bzrlib/_bencode_pyx.o -o /home/ubuntu/tarmac-testing/bzrlib/_bencode_pyx.so
pyrexc bzrlib/_chunks_to_lines_pyx.pyx --> bzrlib/_chunks_to_lines_pyx.c
building 'bzrlib._chunks_to_lines_pyx' extension
x86_64-linux-gnu-gcc -pthread -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -fno-strict-aliasing -Wdate-time -D_FORTIFY_SOURCE=2 -g -fstack-protector-strong -Wformat -Werror=format-security -fPIC -I/usr/include/python2.7 -c bzrlib/_chunks_to_lines_pyx.c -o build/temp.linux-x86_64-2.7/bzrlib/_chunks_to_lines_pyx.o
x86_64-linux-gnu-gcc -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions -Wl,-Bsymbolic-functions -Wl,-z,relro -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -Wdate-time -D_FORTIFY_SOURCE=2 -g -fstack-protector-strong -Wformat -Werror=format-security -Wl,-Bsymbolic-functions -Wl,-z,relro -Wdate-time -D_FORTIFY_SOURCE=2 -g -fstack-protector-strong -Wformat -Werror=format-security build/temp.linux-x86_64-2.7/bzrlib/_chunks_to_lines_pyx.o -o /home/ubuntu/tarmac-testing/bzrlib/_chunks_to_lines_pyx.so
pyrexc bzrlib/_groupcompress_pyx.pyx --> bzrlib/_groupcompress_pyx.c
bu...

bzr PQM (bzr-pqm) wrote :
Download full text (26.7 KiB)

The attempt to merge lp:~vila/bzr/fixing-tarmac into lp:~bzr-pqm/bzr/test-tarmac failed. Below is the output from the failed tests.

building extension modules.
python setup.py build_ext -i
No Cython, trying Pyrex...
running build_ext
pyrexc bzrlib/_annotator_pyx.pyx --> bzrlib/_annotator_pyx.c
building 'bzrlib._annotator_pyx' extension
creating build
creating build/temp.linux-x86_64-2.7
creating build/temp.linux-x86_64-2.7/bzrlib
x86_64-linux-gnu-gcc -pthread -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -fno-strict-aliasing -Wdate-time -D_FORTIFY_SOURCE=2 -g -fstack-protector-strong -Wformat -Werror=format-security -fPIC -I/usr/include/python2.7 -c bzrlib/_annotator_pyx.c -o build/temp.linux-x86_64-2.7/bzrlib/_annotator_pyx.o
x86_64-linux-gnu-gcc -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions -Wl,-Bsymbolic-functions -Wl,-z,relro -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -Wdate-time -D_FORTIFY_SOURCE=2 -g -fstack-protector-strong -Wformat -Werror=format-security -Wl,-Bsymbolic-functions -Wl,-z,relro -Wdate-time -D_FORTIFY_SOURCE=2 -g -fstack-protector-strong -Wformat -Werror=format-security build/temp.linux-x86_64-2.7/bzrlib/_annotator_pyx.o -o /home/ubuntu/tarmac-testing/bzrlib/_annotator_pyx.so
pyrexc bzrlib/_bencode_pyx.pyx --> bzrlib/_bencode_pyx.c
building 'bzrlib._bencode_pyx' extension
x86_64-linux-gnu-gcc -pthread -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -fno-strict-aliasing -Wdate-time -D_FORTIFY_SOURCE=2 -g -fstack-protector-strong -Wformat -Werror=format-security -fPIC -I/usr/include/python2.7 -c bzrlib/_bencode_pyx.c -o build/temp.linux-x86_64-2.7/bzrlib/_bencode_pyx.o
x86_64-linux-gnu-gcc -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions -Wl,-Bsymbolic-functions -Wl,-z,relro -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -Wdate-time -D_FORTIFY_SOURCE=2 -g -fstack-protector-strong -Wformat -Werror=format-security -Wl,-Bsymbolic-functions -Wl,-z,relro -Wdate-time -D_FORTIFY_SOURCE=2 -g -fstack-protector-strong -Wformat -Werror=format-security build/temp.linux-x86_64-2.7/bzrlib/_bencode_pyx.o -o /home/ubuntu/tarmac-testing/bzrlib/_bencode_pyx.so
pyrexc bzrlib/_chunks_to_lines_pyx.pyx --> bzrlib/_chunks_to_lines_pyx.c
building 'bzrlib._chunks_to_lines_pyx' extension
x86_64-linux-gnu-gcc -pthread -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -fno-strict-aliasing -Wdate-time -D_FORTIFY_SOURCE=2 -g -fstack-protector-strong -Wformat -Werror=format-security -fPIC -I/usr/include/python2.7 -c bzrlib/_chunks_to_lines_pyx.c -o build/temp.linux-x86_64-2.7/bzrlib/_chunks_to_lines_pyx.o
x86_64-linux-gnu-gcc -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions -Wl,-Bsymbolic-functions -Wl,-z,relro -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -Wdate-time -D_FORTIFY_SOURCE=2 -g -fstack-protector-strong -Wformat -Werror=format-security -Wl,-Bsymbolic-functions -Wl,-z,relro -Wdate-time -D_FORTIFY_SOURCE=2 -g -fstack-protector-strong -Wformat -Werror=format-security build/temp.linux-x86_64-2.7/bzrlib/_chunks_to_lines_pyx.o -o /home/ubuntu/tarmac-testing/bzrlib/_chunks_to_lines_pyx.so
pyrexc bzrlib/_groupcompress_pyx.pyx --> bzrlib/_groupcompress_pyx.c
bu...

bzr PQM (bzr-pqm) wrote :
Download full text (9.7 MiB)

The attempt to merge lp:~vila/bzr/fixing-tarmac into lp:~bzr-pqm/bzr/test-tarmac failed. Below is the output from the failed tests.

building extension modules.
python setup.py build_ext -i
No Cython, trying Pyrex...
running build_ext
pyrexc bzrlib/_annotator_pyx.pyx --> bzrlib/_annotator_pyx.c
building 'bzrlib._annotator_pyx' extension
creating build
creating build/temp.linux-x86_64-2.7
creating build/temp.linux-x86_64-2.7/bzrlib
x86_64-linux-gnu-gcc -pthread -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -fno-strict-aliasing -Wdate-time -D_FORTIFY_SOURCE=2 -g -fstack-protector-strong -Wformat -Werror=format-security -fPIC -I/usr/include/python2.7 -c bzrlib/_annotator_pyx.c -o build/temp.linux-x86_64-2.7/bzrlib/_annotator_pyx.o
x86_64-linux-gnu-gcc -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions -Wl,-Bsymbolic-functions -Wl,-z,relro -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -Wdate-time -D_FORTIFY_SOURCE=2 -g -fstack-protector-strong -Wformat -Werror=format-security -Wl,-Bsymbolic-functions -Wl,-z,relro -Wdate-time -D_FORTIFY_SOURCE=2 -g -fstack-protector-strong -Wformat -Werror=format-security build/temp.linux-x86_64-2.7/bzrlib/_annotator_pyx.o -o /home/ubuntu/tarmac-testing-5119/bzrlib/_annotator_pyx.so
pyrexc bzrlib/_bencode_pyx.pyx --> bzrlib/_bencode_pyx.c
building 'bzrlib._bencode_pyx' extension
x86_64-linux-gnu-gcc -pthread -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -fno-strict-aliasing -Wdate-time -D_FORTIFY_SOURCE=2 -g -fstack-protector-strong -Wformat -Werror=format-security -fPIC -I/usr/include/python2.7 -c bzrlib/_bencode_pyx.c -o build/temp.linux-x86_64-2.7/bzrlib/_bencode_pyx.o
x86_64-linux-gnu-gcc -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions -Wl,-Bsymbolic-functions -Wl,-z,relro -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -Wdate-time -D_FORTIFY_SOURCE=2 -g -fstack-protector-strong -Wformat -Werror=format-security -Wl,-Bsymbolic-functions -Wl,-z,relro -Wdate-time -D_FORTIFY_SOURCE=2 -g -fstack-protector-strong -Wformat -Werror=format-security build/temp.linux-x86_64-2.7/bzrlib/_bencode_pyx.o -o /home/ubuntu/tarmac-testing-5119/bzrlib/_bencode_pyx.so
pyrexc bzrlib/_chunks_to_lines_pyx.pyx --> bzrlib/_chunks_to_lines_pyx.c
building 'bzrlib._chunks_to_lines_pyx' extension
x86_64-linux-gnu-gcc -pthread -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -fno-strict-aliasing -Wdate-time -D_FORTIFY_SOURCE=2 -g -fstack-protector-strong -Wformat -Werror=format-security -fPIC -I/usr/include/python2.7 -c bzrlib/_chunks_to_lines_pyx.c -o build/temp.linux-x86_64-2.7/bzrlib/_chunks_to_lines_pyx.o
x86_64-linux-gnu-gcc -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions -Wl,-Bsymbolic-functions -Wl,-z,relro -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -Wdate-time -D_FORTIFY_SOURCE=2 -g -fstack-protector-strong -Wformat -Werror=format-security -Wl,-Bsymbolic-functions -Wl,-z,relro -Wdate-time -D_FORTIFY_SOURCE=2 -g -fstack-protector-strong -Wformat -Werror=format-security build/temp.linux-x86_64-2.7/bzrlib/_chunks_to_lines_pyx.o -o /home/ubuntu/tarmac-testing-5119/bzrlib/_chunks_to_lines_pyx.so
pyrexc bzrlib/_groupcompress_pyx.pyx --> bzrlib/_groupco...

lp:~vila/bzr/fixing-tarmac updated on 2016-08-01
6623. By Vincent Ladeuil on 2016-08-01

subunit is needed for subunit-stats

6624. By Vincent Ladeuil on 2016-08-01

subunit defaults to v2 now.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Makefile'
--- Makefile 2016-04-03 16:32:31 +0000
+++ Makefile 2016-08-01 15:03:41 +0000
@@ -44,7 +44,7 @@
44 -$(RM) -f selftest.log44 -$(RM) -f selftest.log
45 echo `date` ": selftest starts" 1>&245 echo `date` ": selftest starts" 1>&2
46 $(PYTHON) -Werror -Wignore::ImportWarning -O ./bzr selftest -Oselftest.timeout=120 \46 $(PYTHON) -Werror -Wignore::ImportWarning -O ./bzr selftest -Oselftest.timeout=120 \
47 --subunit $(tests) | tee selftest.log47 --subunit $(tests) | subunit-1to2 | tee selftest.log | subunit2pyunit
48 echo `date` ": selftest ends" 1>&248 echo `date` ": selftest ends" 1>&2
49 # An empty log file should catch errors in the $(PYTHON)49 # An empty log file should catch errors in the $(PYTHON)
50 # command above (the '|' swallow any errors since 'make'50 # command above (the '|' swallow any errors since 'make'
5151
=== modified file 'bzrlib/transport/sftp.py'
--- bzrlib/transport/sftp.py 2016-01-21 17:48:07 +0000
+++ bzrlib/transport/sftp.py 2016-08-01 15:03:41 +0000
@@ -40,7 +40,7 @@
40 debug,40 debug,
41 errors,41 errors,
42 urlutils,42 urlutils,
43 )43)
44from bzrlib.errors import (FileExists,44from bzrlib.errors import (FileExists,
45 NoSuchFile,45 NoSuchFile,
46 TransportError,46 TransportError,
@@ -55,7 +55,7 @@
55 _file_streams,55 _file_streams,
56 ssh,56 ssh,
57 ConnectedTransport,57 ConnectedTransport,
58 )58)
5959
60# Disable one particular warning that comes from paramiko in Python2.5; if60# Disable one particular warning that comes from paramiko in Python2.5; if
61# this is emitted at the wrong time it tends to cause spurious test failures61# this is emitted at the wrong time it tends to cause spurious test failures
@@ -85,6 +85,8 @@
85_paramiko_version = getattr(paramiko, '__version_info__', (0, 0, 0))85_paramiko_version = getattr(paramiko, '__version_info__', (0, 0, 0))
86# don't use prefetch unless paramiko version >= 1.5.5 (there were bugs earlier)86# don't use prefetch unless paramiko version >= 1.5.5 (there were bugs earlier)
87_default_do_prefetch = (_paramiko_version >= (1, 5, 5))87_default_do_prefetch = (_paramiko_version >= (1, 5, 5))
88_default_prefetch_requires_size = (_paramiko_version >= (1, 16, 0)
89 and _paramiko_version < (2, 0))
8890
8991
90class SFTPLock(object):92class SFTPLock(object):
@@ -315,6 +317,7 @@
315 """Transport implementation for SFTP access."""317 """Transport implementation for SFTP access."""
316318
317 _do_prefetch = _default_do_prefetch319 _do_prefetch = _default_do_prefetch
320 _prefetch_requires_size = _default_prefetch_requires_size
318 # TODO: jam 20060717 Conceivably these could be configurable, either321 # TODO: jam 20060717 Conceivably these could be configurable, either
319 # by auto-tuning at run-time, or by a configuration (per host??)322 # by auto-tuning at run-time, or by a configuration (per host??)
320 # but the performance curve is pretty flat, so just going with323 # but the performance curve is pretty flat, so just going with
@@ -410,8 +413,13 @@
410 try:413 try:
411 path = self._remote_path(relpath)414 path = self._remote_path(relpath)
412 f = self._get_sftp().file(path, mode='rb')415 f = self._get_sftp().file(path, mode='rb')
413 if self._do_prefetch and (getattr(f, 'prefetch', None) is not None):416 if ((self._do_prefetch
414 f.prefetch()417 and (getattr(f, 'prefetch', None) is not None))):
418 if self._prefetch_requires_size:
419 size = f.stat().st_size
420 f.prefetch(size)
421 else:
422 f.prefetch()
415 return f423 return f
416 except (IOError, paramiko.SSHException), e:424 except (IOError, paramiko.SSHException), e:
417 self._translate_io_exception(e, path, ': error retrieving',425 self._translate_io_exception(e, path, ': error retrieving',
418426
=== added file 'ols-vms.conf'
--- ols-vms.conf 1970-01-01 00:00:00 +0000
+++ ols-vms.conf 2016-08-01 15:03:41 +0000
@@ -0,0 +1,13 @@
1bzr.build.depends = python-pyrex, ca-certificates, python, python-all-dev, python-all-dbg, python-configobj, python-docutils, python-paramiko, python-pycurl-dbg, python-subunit, python-testtools, subunit
2vm.packages = bzr, make, gcc, {bzr.build.depends}
3vm.architecture = amd64
4vm.class = lxd
5vm.update = True
6vm.setup_scripts = tools/setup-testbed
7[bzr-trusty]
8vm.release = trusty
9[bzr-xenial]
10vm.release = xenial
11[bzr-yakkety]
12vm.release = yakkety
13lxd.image = ubuntu-daily:{vm.release}/{vm.architecture}
014
=== added file 'tools/setup-testbed'
--- tools/setup-testbed 1970-01-01 00:00:00 +0000
+++ tools/setup-testbed 2016-08-01 15:03:41 +0000
@@ -0,0 +1,8 @@
1#!/bin/sh
2
3# Create a shared repo at $HOME to cache all used revisions (the container
4# is created from scratch often enough that keeping the cache clean is not
5# an issue).
6bzr init-repo ~
7# Pre-load trunk
8bzr branch lp:bzr trunk

Subscribers

People subscribed via source and target branches

to all changes: