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

Fix the macOS buildbot builder

Fixes: ticket:2962

Makefile

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

misc/build_helpers/build-osx-pkg.sh

@@ -4,6 +4,9 @@ VERSION=`sh -c "cat src/allmydata/_version.py | grep verstr | head -n 1 | cut -d
 PWD=`pwd`
 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
 osx-venv/bin/pip install .
 

misc/build_helpers/test-osx-pkg.py

@@ -31,6 +31,8 @@
 # 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)
 
+from __future__ import print_function
+
 import os, re, shutil, subprocess, sys, tempfile
 
 def test_osx_pkg(pkgfile):
@@ -56,7 +58,7 @@ def test_osx_pkg(pkgfile):
     gunzip_process = subprocess.Popen(['gunzip', '-dc'],
                                       stdin=cat_process.stdout,
                                       stdout=subprocess.PIPE)
-    cpio_process = subprocess.Popen(['cpio', '-i'],
+    cpio_process = subprocess.Popen(['cpio', '-i', '--verbose'],
                                     stdin=gunzip_process.stdout,
                                     stdout=subprocess.PIPE)
     cpio_process.communicate()
@@ -68,6 +70,13 @@ def test_osx_pkg(pkgfile):
 
         rc = callit.wait()
         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))
         stdouttxt = callit.stdout.read()
 
@@ -86,9 +95,8 @@ def test_osx_pkg(pkgfile):
 if __name__ == '__main__':
     pkgs = [fn for fn in os.listdir(".") if fn.endswith("-osx.pkg")]
     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)
-    print "Testing %s ..." % pkgs[0]
+    print("Testing %s ..." % pkgs[0])
     test_osx_pkg(pkgs[0])
-    print "Looks OK!"
-
+    print("Looks OK!")

newsfragments/2962.other

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