Merge lp:~jimbaker/pyjuju/butler into lp:pyjuju/ftests

[Jim Baker]

Implements the opinionated driver as specified

[Gustavo Niemeyer (niemeyer)]

Looks good, please merge on ftests Jim.

review: Approve

=== added file 'butler.py'
--- butler.py	1970-01-01 00:00:00 +0000
+++ butler.py	2011-09-10 03:42:23 +0000
@@ -0,0 +1,104 @@
+#!/usr/bin/env python
+# butler - Runs Emsemble's functional tests via churn and gens waterfall html
+#
+# A butler originally managed the buttery, which in part stores the
+# results of the butter that was churned.
+
+import argparse
+import os
+import subprocess
+import sys
+
+from subprocess import check_output, CalledProcessError
+
+
+def main():
+    """Checks out desired branch, runs tests, and summarizes results."""
+    parser = argparse.ArgumentParser(
+        description="Runs functional tests against desired Ensemble branch.")
+    parser.add_argument("build", help="Directory to build the results")
+    parser.add_argument("--branch", default="lp:ensemble")
+    args = parser.parse_args()
+
+    build_path = os.path.abspath(args.build)
+    ensemble_path = os.path.join(build_path, "ensemble")
+    waterfall_path = os.path.join(build_path, "waterfall")
+    if not os.path.exists(build_path):
+        os.makedirs(build_path)
+    update_bzr_to_tip(args.branch, ensemble_path)
+    branch_max_revno = get_max_revno_in_branch(ensemble_path)
+    waterfall_max_revno = get_max_revno_in_waterfall(waterfall_path)
+    if not waterfall_max_revno:
+        waterfall_max_revno = branch_max_revno
+    for revno in xrange(waterfall_max_revno, branch_max_revno + 1):
+        checkout_revision(ensemble_path, revno)
+        churn(ensemble_path, waterfall_path, revno)
+    generate_waterfall(build_path, waterfall_path)
+
+
+def update_bzr_to_tip(branch, ensemble_path):
+    if os.path.exists(ensemble_path):
+        # Update to tip. Later we may go back through to previous versions
+        print >> sys.stderr, "Updating checkout of %s to tip..." % branch,
+        check_output(["/usr/bin/bzr", "update", ensemble_path],
+                     stderr=subprocess.STDOUT)
+        print >> sys.stderr, "done."
+    else:
+        # Starting from scratch
+        print >> sys.stderr, "Checking out %s..." % branch,
+        check_output(["/usr/bin/bzr", "co", branch, ensemble_path],
+                     stderr=subprocess.STDOUT)
+        print >> sys.stderr, "done."
+
+
+def get_max_revno_in_waterfall(waterfall_path):
+    if not os.path.exists(waterfall_path):
+        os.makedirs(waterfall_path)
+        return 0
+    churns = os.listdir(waterfall_path)
+    if not churns:
+        return 0
+    return max(int(churn) for churn in churns)
+
+
+def get_max_revno_in_branch(ensemble_path):
+    return int(check_output(["/usr/bin/bzr", "revno", ensemble_path]))
+
+
+def checkout_revision(ensemble_path, revno):
+    check_output(
+        ["/usr/bin/bzr", "update", "--revision", str(revno), ensemble_path],
+        stderr=subprocess.STDOUT)
+
+
+def churn(ensemble_path, waterfall_path, revno):
+    output_path = os.path.join(waterfall_path, str(revno))
+    if os.path.exists(output_path):
+        print >> sys.stderr, "Skipping tests for %s, %s already exists" % (
+            revno, output_path)
+        return
+    os.makedirs(output_path)
+    print >> sys.stderr, "Running functional tests for %s in %s..." % (
+        revno, output_path),
+    try:
+        # For now, ignore non-zero exit codes here; churn will exit
+        # with 1 if any of its tests fail
+        check_output(
+            ["./churn", "-o", output_path],
+            env={"PYTHONPATH": ensemble_path,
+             "PATH": "%s:%s" % (
+                    os.path.join(ensemble_path, "bin"),
+                    os.environ.get("PATH"))})
+    except CalledProcessError:
+        pass
+    print >> sys.stderr, "done."
+
+
+def generate_waterfall(build_path, waterfall_path):
+    html_path = os.path.join(build_path, "waterfall.html")
+    check_output(
+        ["./waterfall.py %s > %s" % (waterfall_path, html_path)], shell=True)
+
+
+if __name__ == "__main__":
+    main()

=== modified file 'waterfall.py' (properties changed: -x to +x)
--- waterfall.py	2011-09-10 03:42:23 +0000
+++ waterfall.py	2011-09-10 03:42:23 +0000
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # waterfall - Generate waterfall report from test runs
 
 import argparse