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
1=== modified file 'Makefile'
2--- Makefile 2016-04-03 16:32:31 +0000
3+++ Makefile 2016-08-01 15:03:41 +0000
4@@ -44,7 +44,7 @@
5 -$(RM) -f selftest.log
6 echo `date` ": selftest starts" 1>&2
7 $(PYTHON) -Werror -Wignore::ImportWarning -O ./bzr selftest -Oselftest.timeout=120 \
8- --subunit $(tests) | tee selftest.log
9+ --subunit $(tests) | subunit-1to2 | tee selftest.log | subunit2pyunit
10 echo `date` ": selftest ends" 1>&2
11 # An empty log file should catch errors in the $(PYTHON)
12 # command above (the '|' swallow any errors since 'make'
13
14=== modified file 'bzrlib/transport/sftp.py'
15--- bzrlib/transport/sftp.py 2016-01-21 17:48:07 +0000
16+++ bzrlib/transport/sftp.py 2016-08-01 15:03:41 +0000
17@@ -40,7 +40,7 @@
18 debug,
19 errors,
20 urlutils,
21- )
22+)
23 from bzrlib.errors import (FileExists,
24 NoSuchFile,
25 TransportError,
26@@ -55,7 +55,7 @@
27 _file_streams,
28 ssh,
29 ConnectedTransport,
30- )
31+)
32
33 # Disable one particular warning that comes from paramiko in Python2.5; if
34 # this is emitted at the wrong time it tends to cause spurious test failures
35@@ -85,6 +85,8 @@
36 _paramiko_version = getattr(paramiko, '__version_info__', (0, 0, 0))
37 # don't use prefetch unless paramiko version >= 1.5.5 (there were bugs earlier)
38 _default_do_prefetch = (_paramiko_version >= (1, 5, 5))
39+_default_prefetch_requires_size = (_paramiko_version >= (1, 16, 0)
40+ and _paramiko_version < (2, 0))
41
42
43 class SFTPLock(object):
44@@ -315,6 +317,7 @@
45 """Transport implementation for SFTP access."""
46
47 _do_prefetch = _default_do_prefetch
48+ _prefetch_requires_size = _default_prefetch_requires_size
49 # TODO: jam 20060717 Conceivably these could be configurable, either
50 # by auto-tuning at run-time, or by a configuration (per host??)
51 # but the performance curve is pretty flat, so just going with
52@@ -410,8 +413,13 @@
53 try:
54 path = self._remote_path(relpath)
55 f = self._get_sftp().file(path, mode='rb')
56- if self._do_prefetch and (getattr(f, 'prefetch', None) is not None):
57- f.prefetch()
58+ if ((self._do_prefetch
59+ and (getattr(f, 'prefetch', None) is not None))):
60+ if self._prefetch_requires_size:
61+ size = f.stat().st_size
62+ f.prefetch(size)
63+ else:
64+ f.prefetch()
65 return f
66 except (IOError, paramiko.SSHException), e:
67 self._translate_io_exception(e, path, ': error retrieving',
68
69=== added file 'ols-vms.conf'
70--- ols-vms.conf 1970-01-01 00:00:00 +0000
71+++ ols-vms.conf 2016-08-01 15:03:41 +0000
72@@ -0,0 +1,13 @@
73+bzr.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
74+vm.packages = bzr, make, gcc, {bzr.build.depends}
75+vm.architecture = amd64
76+vm.class = lxd
77+vm.update = True
78+vm.setup_scripts = tools/setup-testbed
79+[bzr-trusty]
80+vm.release = trusty
81+[bzr-xenial]
82+vm.release = xenial
83+[bzr-yakkety]
84+vm.release = yakkety
85+lxd.image = ubuntu-daily:{vm.release}/{vm.architecture}
86
87=== added file 'tools/setup-testbed'
88--- tools/setup-testbed 1970-01-01 00:00:00 +0000
89+++ tools/setup-testbed 2016-08-01 15:03:41 +0000
90@@ -0,0 +1,8 @@
91+#!/bin/sh
92+
93+# Create a shared repo at $HOME to cache all used revisions (the container
94+# is created from scratch often enough that keeping the cache clean is not
95+# an issue).
96+bzr init-repo ~
97+# Pre-load trunk
98+bzr branch lp:bzr trunk

Subscribers

People subscribed via source and target branches

to all changes: