ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-01-03 11:44:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #542 from tahoe-lafs/2962.buildbot-macos-package-failure

Browse Source 
Fix the macOS buildbot builder

Fixes: ticket:2962
This commit is contained in:
Jean-Paul Calderone 2019-01-26 14:40:27 -05:00 committed by GitHub
commit 8ba452c62a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -33,12 +33,14 @@ test-osx-pkg:
$(PYTHON) misc/build_helpers/test-osx-pkg.py $(PYTHON) misc/build_helpers/test-osx-pkg.py
upload-osx-pkg: upload-osx-pkg:
@echo "uploading to ~tahoe-tarballs/OS-X-packages/ via flappserver" # [Failure instance: Traceback: <class 'OpenSSL.SSL.Error'>: [('SSL routines', 'ssl3_read_bytes', 'tlsv1 alert unknown ca'), ('SSL routines', 'ssl3_write_bytes', 'ssl handshake failure')]
@if [ "X${BB_BRANCH}" = "Xmaster" ] || [ "X${BB_BRANCH}" = "X" ]; then \ #
flappclient --furlfile ~/.tahoe-osx-pkg-upload.furl upload-file tahoe-lafs-*-osx.pkg; \ # @echo "uploading to ~tahoe-tarballs/OS-X-packages/ via flappserver"
else \ # @if [ "X${BB_BRANCH}" = "Xmaster" ] || [ "X${BB_BRANCH}" = "X" ]; then \
echo not uploading tahoe-lafs-osx-pkg because this is not trunk but is branch \"${BB_BRANCH}\" ; \ # flappclient --furlfile ~/.tahoe-osx-pkg-upload.furl upload-file tahoe-lafs-*-osx.pkg; \
fi # else \
# echo not uploading tahoe-lafs-osx-pkg because this is not trunk but is branch \"${BB_BRANCH}\" ; \
# fi
.PHONY: smoketest .PHONY: smoketest
smoketest: smoketest:

3
misc/build_helpers/build-osx-pkg.sh
View File

@ -4,6 +4,9 @@ VERSION=`sh -c "cat src/allmydata/_version.py | grep verstr | head -n 1 | cut -d
PWD=`pwd` PWD=`pwd`
TARGET="/Applications/tahoe.app" TARGET="/Applications/tahoe.app"
# Clean up any test garbage that might be left over from a recent test run.
rm -rvf _trial_temp
virtualenv osx-venv virtualenv osx-venv
osx-venv/bin/pip install . osx-venv/bin/pip install .

18
misc/build_helpers/test-osx-pkg.py
View File

@ -31,6 +31,8 @@
# characteristic: 14.1.0 (/Applications/tahoe.app/support/lib/python2.7/site-packages) # characteristic: 14.1.0 (/Applications/tahoe.app/support/lib/python2.7/site-packages)
# pyasn1-modules: 0.0.5 (/Applications/tahoe.app/support/lib/python2.7/site-packages/pyasn1_modules-0.0.5-py2.7.egg) # pyasn1-modules: 0.0.5 (/Applications/tahoe.app/support/lib/python2.7/site-packages/pyasn1_modules-0.0.5-py2.7.egg)
from __future__ import print_function
import os, re, shutil, subprocess, sys, tempfile import os, re, shutil, subprocess, sys, tempfile
def test_osx_pkg(pkgfile): def test_osx_pkg(pkgfile):
@ -56,7 +58,7 @@ def test_osx_pkg(pkgfile):
gunzip_process = subprocess.Popen(['gunzip', '-dc'], gunzip_process = subprocess.Popen(['gunzip', '-dc'],
stdin=cat_process.stdout, stdin=cat_process.stdout,
stdout=subprocess.PIPE) stdout=subprocess.PIPE)
cpio_process = subprocess.Popen(['cpio', '-i'], cpio_process = subprocess.Popen(['cpio', '-i', '--verbose'],
stdin=gunzip_process.stdout, stdin=gunzip_process.stdout,
stdout=subprocess.PIPE) stdout=subprocess.PIPE)
cpio_process.communicate() cpio_process.communicate()
@ -68,6 +70,13 @@ def test_osx_pkg(pkgfile):
rc = callit.wait() rc = callit.wait()
if rc != 0: if rc != 0:
print(
"{} failed.\n"
"stdout: {}\n"
"stderr: {}\n".format(
cmd, callit.stdout.read(), callit.stderr.read(),
),
)
raise Exception("FAIL: '%s' returned non-zero exit code: %r" % (" ".join(cmd), rc)) raise Exception("FAIL: '%s' returned non-zero exit code: %r" % (" ".join(cmd), rc))
stdouttxt = callit.stdout.read() stdouttxt = callit.stdout.read()
@ -86,9 +95,8 @@ def test_osx_pkg(pkgfile):
if __name__ == '__main__': if __name__ == '__main__':
pkgs = [fn for fn in os.listdir(".") if fn.endswith("-osx.pkg")] pkgs = [fn for fn in os.listdir(".") if fn.endswith("-osx.pkg")]
if len(pkgs) != 1: if len(pkgs) != 1:
print "ERR: unable to find a single .pkg file:", pkgs print("ERR: unable to find a single .pkg file:", pkgs)
sys.exit(1) sys.exit(1)
print "Testing %s ..." % pkgs[0] print("Testing %s ..." % pkgs[0])
test_osx_pkg(pkgs[0]) test_osx_pkg(pkgs[0])
print "Looks OK!" print("Looks OK!")

1
newsfragments/2962.other Normal file
View File

@ -0,0 +1 @@
Some macOS continuous integration failures have been fixed.