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

[Vincent Ladeuil]

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

Testing tarmac, no review needed, thanks anyway ;)

[Vincent Ladeuil (vila)]

review: Approve

[bzr PQM (bzr-pqm)]

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)]

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)]

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)]

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]

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.

=== modified file 'Makefile'
--- Makefile	2016-04-03 16:32:31 +0000
+++ Makefile	2016-08-01 15:03:41 +0000
@@ -44,7 +44,7 @@
 	-$(RM) -f selftest.log
 	echo `date` ": selftest starts" 1>&2
 	$(PYTHON) -Werror -Wignore::ImportWarning -O ./bzr selftest -Oselftest.timeout=120 \
-	  --subunit $(tests) | tee selftest.log
+	  --subunit $(tests) | subunit-1to2 | tee selftest.log | subunit2pyunit
 	echo `date` ": selftest ends" 1>&2
 	# An empty log file should catch errors in the $(PYTHON)
 	# command above (the '|' swallow any errors since 'make'

=== 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 @@
     debug,
     errors,
     urlutils,
-    )
+)
 from bzrlib.errors import (FileExists,
                            NoSuchFile,
                            TransportError,
@@ -55,7 +55,7 @@
     _file_streams,
     ssh,
     ConnectedTransport,
-    )
+)
 
 # Disable one particular warning that comes from paramiko in Python2.5; if
 # this is emitted at the wrong time it tends to cause spurious test failures
@@ -85,6 +85,8 @@
 _paramiko_version = getattr(paramiko, '__version_info__', (0, 0, 0))
 # don't use prefetch unless paramiko version >= 1.5.5 (there were bugs earlier)
 _default_do_prefetch = (_paramiko_version >= (1, 5, 5))
+_default_prefetch_requires_size = (_paramiko_version >= (1, 16, 0)
+                                   and _paramiko_version < (2, 0))
 
 
 class SFTPLock(object):
@@ -315,6 +317,7 @@
     """Transport implementation for SFTP access."""
 
     _do_prefetch = _default_do_prefetch
+    _prefetch_requires_size = _default_prefetch_requires_size
     # TODO: jam 20060717 Conceivably these could be configurable, either
     #       by auto-tuning at run-time, or by a configuration (per host??)
     #       but the performance curve is pretty flat, so just going with
@@ -410,8 +413,13 @@
         try:
             path = self._remote_path(relpath)
             f = self._get_sftp().file(path, mode='rb')
-            if self._do_prefetch and (getattr(f, 'prefetch', None) is not None):
-                f.prefetch()
+            if ((self._do_prefetch
+                 and (getattr(f, 'prefetch', None) is not None))):
+                if self._prefetch_requires_size:
+                    size = f.stat().st_size
+                    f.prefetch(size)
+                else:
+                    f.prefetch()
             return f
         except (IOError, paramiko.SSHException), e:
             self._translate_io_exception(e, path, ': error retrieving',

=== 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 @@
+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
+vm.packages = bzr, make, gcc, {bzr.build.depends}
+vm.architecture = amd64
+vm.class = lxd
+vm.update = True
+vm.setup_scripts = tools/setup-testbed
+[bzr-trusty]
+vm.release = trusty
+[bzr-xenial]
+vm.release = xenial
+[bzr-yakkety]
+vm.release = yakkety
+lxd.image = ubuntu-daily:{vm.release}/{vm.architecture}

=== 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 @@
+#!/bin/sh
+
+# Create a shared repo at $HOME to cache all used revisions (the container
+# is created from scratch often enough that keeping the cache clean is not
+# an issue).
+bzr init-repo ~
+# Pre-load trunk
+bzr branch lp:bzr trunk