setup: add "test_mac_diskimage" command which attempts to mount and use a .dmg to...

diff --git a/misc/test_mac_diskimage.py b/misc/test_mac_diskimage.py
new file mode 100644 (file)
index 0000000..7d2f497
--- /dev/null
+++ b/misc/test_mac_diskimage.py
@@ -0,0 +1,72 @@
+# This script uses hdiutil to attach a dmg (whose name is derived from the
+# appname and the version number passed in), asserts that it attached as
+# expected, cd's into the mounted filesystem, executes "$appname
+# --version-and-path", and checks whether the output of --version-and-path is
+# right.
+
+# If all of the paths listed therein are loaded from within the current PWD
+# then it exits with code 0.
+
+# If anything goes wrong then it exits with non-zero (failure).  This is to
+# check that the Mac OS "DMG" (disk image) package that gets built is correctly
+# loading all of its packages from inside the image.
+
+# Here is an example output from --version-and-path:
+
+# allmydata-tahoe: 1.4.1-r3916 (/home/zooko/playground/allmydata/tahoe/trunk/trunk/src), foolscap: 0.4.1 (/usr/local/lib/python2.6/dist-packages/foolscap-0.4.1-py2.6.egg), pycryptopp: 0.5.10 (/home/zooko/playground/allmydata/tahoe/trunk/trunk/support/lib/python2.6/site-packages/pycryptopp-0.5.10-py2.6-linux-x86_64.egg), zfec: 1.4.2 (/usr/local/lib/python2.6/dist-packages/zfec-1.4.2-py2.6-linux-x86_64.egg), Twisted: 8.2.0-r26987 (/usr/local/lib/python2.6/dist-packages/Twisted-8.2.0_r26987-py2.6-linux-x86_64.egg), Nevow: 0.9.32 (/home/zooko/playground/allmydata/tahoe/trunk/trunk/support/lib/python2.6/site-packages/Nevow-0.9.32-py2.6.egg), zope.interface: 3.4.0 (/usr/lib/python2.6/dist-packages), python: 2.6.2 (/usr/bin/python), platform: Linux-Ubuntu_9.04-x86_64-64bit_ELF (None), sqlite: 3.6.10 (unknown), simplejson: 2.0.1 (/usr/local/lib/python2.6/dist-packages/simplejson-2.0.1-py2.6-linux-x86_64.egg), argparse: 0.8.0 (/usr/local/lib/python2.6/dist-packages/argparse-0.8.0-py2.6.egg), pyOpenSSL: 0.7 (/home/zooko/playground/allmydata/tahoe/trunk/trunk/support/lib/python2.6/site-packages/pyOpenSSL-0.7-py2.6-linux-x86_64.egg), pyutil: 1.3.30 (/usr/local/lib/python2.6/dist-packages/pyutil-1.3.30-py2.6.egg), zbase32: 1.1.1 (/usr/local/lib/python2.6/dist-packages/zbase32-1.1.1-py2.6.egg), setuptools: 0.6c12dev (/home/zooko/playground/allmydata/tahoe/trunk/trunk/support/lib/python2.6/site-packages/setuptools-0.6c12dev.egg), pysqlite: 2.4.1 (/usr/lib/python2.6/sqlite3)
+
+import os, re, subprocess, time
+
+def test_mac_diskimage(appname, version):
+    """ Return True on success, raise exception on failure. """
+    assert isinstance(appname, basestring), appname
+    assert isinstance(version, basestring), version
+    DMGNAME='mac/'+appname+'-'+version+'.dmg'
+
+    cmd = ['hdiutil', 'attach', DMGNAME]
+    attachit = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    rc = attachit.wait()
+    if rc != 0:
+        raise Exception("FAIL: hdiutil returned non-zero exit code: %r from command: %r" % (rc, cmd,))
+
+    stderrtxt = attachit.stderr.read()
+    if stderrtxt:
+        raise Exception("FAIL: hdiutil said something on stderr: %r" % (stderrtxt,))
+    stdouttxt = attachit.stdout.read()
+    mo = re.search("^(/[^ ]+)\s+Apple_HFS\s+(/Volumes/.*)$", stdouttxt, re.UNICODE|re.MULTILINE)
+    if not mo:
+        raise Exception("FAIL: hdiutil said something on stdout that didn't match our expectations: %r" % (stdouttxt,))
+    DEV=mo.group(1)
+    MOUNTPOINT=mo.group(2)
+
+    try:
+        basedir = MOUNTPOINT + '/' + appname + '.app/Contents/Resources'
+
+        os.chdir(basedir)
+
+        callit = subprocess.Popen(['../MacOS/' + appname, '--version-and-path'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        deadline = time.time() + 2 # If it takes longer than 2 seconds to do this then it fails.
+        while True:
+            rc = callit.poll()
+            if rc is not None:
+                break
+            if time.time() > deadline:
+                os.kill(callit.pid, 9)
+                raise Exception("FAIL: it took longer than 2 seconds to invoke $appname --version-and-path.")
+            time.sleep(0.05)
+
+        if rc != 0:
+            raise Exception("FAIL: $appname --version-and-path returned non-zero exit code: %r" % (rc,))
+
+        stdouttxt = callit.stdout.read()
+
+        PKG_VER_PATH_RE=re.compile("(\S+): (\S+) \((.+?)\), ", re.UNICODE)
+
+        for mo in PKG_VER_PATH_RE.finditer(stdouttxt):
+            if not mo.group(3).startswith(basedir):
+                raise Exception("FAIL: found package not loaded from basedir (%s); package was: %s" % (basedir, mo.groups(),))
+
+        return True # success!
+    finally:
+        subprocess.call(['hdiutil', 'detach', DEV])
+

diff --git a/setup.cfg b/setup.cfg
index 280ce0ec320eafc48a553f33d57cd5c82285e684..f142321004199a82b41ef8e7cae3be0cc28e2da7 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -48,3 +48,4 @@ install = darcsver --count-all-patches install
 bdist_egg = darcsver --count-all-patches bdist_egg
 trial = darcsver --count-all-patches trial
 sdist_dsc = darcsver --count-all-patches sdist_dsc
+test_mac_diskimage = darcsver --count-all-patches test_mac_diskimage

diff --git a/setup.py b/setup.py
index dc884f07ed2032e62309b2ccc256d5ace4cb2311..6e24acd34326a53c90ec59a3900fbc1e56b73d41 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -190,6 +190,18 @@ class RunWithPythonPath(Command):
         rc = subprocess.call(command)
         sys.exit(rc)
 
+class TestMacDiskImage(Command):
+    user_options = []
+    def initialize_options(self):
+        pass
+    def finalize_options(self):
+        pass
+    def run(self):
+        import sys
+        sys.path.append('misc')
+        import test_mac_diskimage
+        return test_mac_diskimage.test_mac_diskimage('Allmydata', version=self.distribution.metadata.version)
+
 class CheckAutoDeps(Command):
     user_options = []
     def initialize_options(self):
@@ -332,6 +344,7 @@ setup(name=APPNAME,
                 "show_pythonpath": ShowPythonPath,
                 "run_with_pythonpath": RunWithPythonPath,
                 "check_auto_deps": CheckAutoDeps,
+                "test_mac_diskimage": TestMacDiskImage,
                 "make_executable": MakeExecutable,
                 "sdist": MySdist,
                 },