More test setup and teardown functionality.

- Legacy-Id: 204

test/buildbot-master.cfg

@@ -0,0 +1,192 @@
+# -*- python -*-
+# ex: set syntax=python:
+
+# This is a sample buildmaster config file. It must be installed as
+# 'master.cfg' in your buildmaster's base directory (although the filename
+# can be changed with the --basedir option to 'mktap buildbot master').
+
+# It has one job: define a dictionary named BuildmasterConfig. This
+# dictionary has a variety of keys to control different aspects of the
+# buildmaster. They are documented in docs/config.xhtml .
+
+
+# This is the dictionary that the buildmaster pays attention to. We also use
+# a shorter alias to save typing.
+c = BuildmasterConfig = {}
+
+####### BUILDSLAVES
+
+# the 'bots' list defines the set of allowable buildslaves. Each element is a
+# tuple of bot-name and bot-password. These correspond to values given to the
+# buildslave's mktap invocation.
+c['bots'] = [("merlot", "U-Xmpr"),             
+            ]
+
+
+# 'slavePortnum' defines the TCP port to listen on. This must match the value
+# configured into the buildslaves (with their --master option)
+
+c['slavePortnum'] = 2718
+
+
+####### CHANGESOURCES
+
+# the 'sources' list tells the buildmaster how it should find out about
+# source code changes. Any class which implements IChangeSource can be added
+# to this list: there are several in buildbot/changes/*.py to choose from.
+
+c['sources'] = []
+
+# For example, if you had CVSToys installed on your repository, and your
+# CVSROOT/freshcfg file had an entry like this:
+#pb = ConfigurationSet([
+#    (None, None, None, PBService(userpass=('foo', 'bar'), port=4519)),
+#    ])
+
+# then you could use the following buildmaster Change Source to subscribe to
+# the FreshCVS daemon and be notified on every commit:
+#
+#from buildbot.changes.freshcvs import FreshCVSSource
+#fc_source = FreshCVSSource("cvs.example.com", 4519, "foo", "bar")
+#c['sources'].append(fc_source)
+
+# or, use a PBChangeSource, and then have your repository's commit script run
+# 'buildbot sendchange', or contrib/svn_buildbot.py, or
+# contrib/arch_buildbot.py :
+#
+from buildbot.changes.pb import PBChangeSource
+c['sources'].append(PBChangeSource())
+
+
+####### SCHEDULERS
+
+## configure the Schedulers
+
+from buildbot.scheduler import Scheduler
+c['schedulers'] = []
+c['schedulers'].append(Scheduler(name="all", branch=None,
+                                 treeStableTimer=2*60,
+                                 builderNames=["merlot-builder-1"]))
+
+
+####### BUILDERS
+
+# the 'builders' list defines the Builders. Each one is configured with a
+# dictionary, using the following keys:
+#  name (required): the name used to describe this bilder
+#  slavename (required): which slave to use, must appear in c['bots']
+#  builddir (required): which subdirectory to run the builder in
+#  factory (required): a BuildFactory to define how the build is run
+#  periodicBuildTime (optional): if set, force a build every N seconds
+
+# buildbot/process/factory.py provides several BuildFactory classes you can
+# start with, which implement build processes for common targets (GNU
+# autoconf projects, CPAN perl modules, etc). The factory.BuildFactory is the
+# base class, and is configured with a series of BuildSteps. When the build
+# is run, the appropriate buildslave is told to execute each Step in turn.
+
+# the first BuildStep is typically responsible for obtaining a copy of the
+# sources. There are source-obtaining Steps in buildbot/process/step.py for
+# CVS, SVN, and others.
+
+from buildbot.process import factory
+from buildbot.steps.source import SVN
+from buildbot.steps.dummy import Dummy
+from buildbot.steps.python import PyFlakes
+from buildbot.steps.shell import ShellCommand as BaseShellCommand
+from buildbot.status.builder import SUCCESS, WARNINGS, FAILURE
+
+class ShellCommand(BaseShellCommand):
+    def evaluateCommand(self, cmd):
+        if cmd.rc == 0:
+            return SUCCESS
+        if cmd.rc == 1:
+            return WARNINGS
+        else:
+            return FAILURE
+            
+f1 = factory.BuildFactory()
+f1.addStep(SVN, svnurl="http://svn.tools.ietf.org/svn/tools/ietfdb/trunk/", username="buildbot@tools.ietf.org", password="U64#GUxr")
+f1.addStep(ShellCommand, command=["test/test-setup"])
+f1.addStep(PyFlakes, command=["pyflakes", "ietf"], warnOnFailure=True)
+f1.addStep(ShellCommand, command=["python", "ietf/manage.py", "test"], env={'PYTHONPATH': ["test/lib",]} )
+f1.addStep(ShellCommand, command=["test/test-teardown"])
+f1.addStep(Dummy, timeout=10)
+
+b1 = {'name': "merlot-builder-1",
+      'slavename': "merlot",
+      'builddir': "builder1",
+      'factory': f1,
+      }
+c['builders'] = [b1]
+
+
+####### STATUS TARGETS
+
+# 'status' is a list of Status Targets. The results of each build will be
+# pushed to these targets. buildbot/status/*.py has a variety to choose from,
+# including web pages, email senders, and IRC bots.
+
+c['status'] = []
+
+#from buildbot.status import html
+#c['status'].append(html.Waterfall(http_port=8010))
+
+import trac_buildbot_html as trac_html
+c['status'].append(trac_html.Waterfall(http_port=8010))
+
+import trac_buildbot_html_dev as trac_html_dev
+c['status'].append(trac_html_dev.Waterfall(http_port=8011))
+
+# from buildbot.status import mail
+# c['status'].append(mail.MailNotifier(fromaddr="buildbot@tools.ietf.org",
+#                                      extraRecipients=["django-project@ietf.org"],
+#                                      mode="problem",
+#                                      mode="failing",
+#                                      sendToInterestedUsers=True))
+
+# from buildbot.status import words
+# c['status'].append(words.IRC(host="irc.example.com", nick="bb",
+#                              channels=["#example"]))
+#
+# from buildbot.status import client
+# c['status'].append(client.PBListener(9988))
+
+
+####### DEBUGGING OPTIONS
+
+# if you set 'debugPassword', then you can connect to the buildmaster with
+# the diagnostic tool in contrib/debugclient.py . From this tool, you can
+# manually force builds and inject changes, which may be useful for testing
+# your buildmaster without actually commiting changes to your repository (or
+# before you have a functioning 'sources' set up). The debug tool uses the
+# same port number as the slaves do: 'slavePortnum'.
+
+#c['debugPassword'] = "debugpassword"
+
+# if you set 'manhole', you can ssh into the buildmaster and get an
+# interactive python shell, which may be useful for debugging buildbot
+# internals. It is probably only useful for buildbot developers. You can also
+# use an authorized_keys file, or plain telnet.
+#from buildbot import manhole
+#c['manhole'] = manhole.PasswordManhole("tcp:9999:interface=127.0.0.1",
+#                                       "admin", "password")
+
+
+####### PROJECT IDENTITY
+
+# the 'projectName' string will be used to describe the project that this
+# buildbot is working on. For example, it is used as the title of the
+# waterfall HTML page. The 'projectURL' string will be used to provide a link
+# from buildbot HTML pages to your project's home page.
+
+c['projectName'] = "IETFdb"
+c['projectURL'] = "http://merlot.tools.ietf.org/tools/ietfdb/"
+
+# the 'buildbotURL' string should point to the location where the buildbot's
+# internal web server (usually the html.Waterfall page) is visible. This
+# typically uses the port number set in the Waterfall 'status' entry, but
+# with an externally-visible host name which the buildbot cannot figure out
+# without some help.
+
+c['buildbotURL'] = "http://merlot.tools.ietf.org:8010/"

test/patch-django

@@ -1,15 +0,0 @@
-#!/bin/bash
-#
-# This script expects to be started by a Buildbot slave with PWD set to the build 
-# directory.  Assuming we check out trunk or branch-XXX with the command
-#	'svn co URL/BRANCH/'
-# then this script will at $PWD/test/patch-django and we will place our patched
-# django in $PWD/test/lib/django
-#
-
-build=$PWD
-django=$(python -c "import django; import os.path; print os.path.realpath(django.__path__[0])")
-
-rsync -Cav $django $build/test/lib/
-cd $build/test/lib
-patch -p 3 -s -t -N < $build/test/r5106.patch

test/settings_local_test.py

@@ -1,14 +1,3 @@
 
-# Make this unique, and don't share it with anybody.
-SECRET_KEY = 'oa0w4@r(=_0qvlnt#9c*_)3rclq4m^zd+19z)zk!=fo=d!ibyw'
-
-DATABASE_NAME = 'ietfdb'             # Or path to database file if using sqlite3.
-DATABASE_USER = 'django'             # Not used with sqlite3.
-DATABASE_PASSWORD = 'zappa00'         # Not used with sqlite3.
-
-USE_I18N = False
-
-TIME_ZONE = 'Europe/Stockholm'
-
 SERVER_MODE = 'test'
 

test/shell-utils

@@ -0,0 +1,47 @@
+# -*- shell -*-
+
+# ----------------------------------------------------------------------
+#	Helpers
+#
+
+[ "$program" ] || program=${0##*/}
+
+function err() { 
+	echo "$program: Error: $*" 1>&2; 
+	exit 2
+}
+
+function warn() { 
+	echo "$program: Warning: $*" 1>&2; 
+	warnings=1
+}
+
+function note() { 
+	if [ -n "$OPT_VERBOSE" ]; then say $*; fi
+}
+
+function say() { 
+	echo -e "$program: $*" 1>&2; 
+}
+
+function version() {  
+	echo -e "$program: v$version\n\nRunning as $(id -urn) on $(date +'%Y-%m-%d %H:%M')"
+}
+
+function filedate() {
+    ls --full-time "$1"  | tr ":." "  " | awk '{printf "%sT%s:%s:%s%s:%s\n", $6, $7, $8, $9, substr($11,1,3), substr($11,4,2)}';
+}
+
+function py_module_path() {
+    module=$1
+    python -c "import $module, os.path; print os.path.realpath($module.__path__[0])"
+}
+
+function py_module_file() {
+    module=$1
+    python -c "import $module, os.path; print os.path.realpath($module.__file__)[:-4] + '.py'"
+}
+
+
+trap 'echo "$program($LINENO): Command failed with error code $? ($0 $*)"; exit 1' ERR
+

test/test-setup

@@ -1,6 +1,55 @@
 #!/bin/bash
 #
-# put in place a suitable settings_local.py for our application to find
+# This script expects to be started by a Buildbot slave with PWD set to the build 
+# directory.
 
-cp test/settings_local_test.py ietf/settings_local.py
+# Script Setup
+# ============
 
+program=${0##*/}
+progdir=${0%/*}
+build=$PWD
+
+. $progdir/shell-utils
+
+# Patch Django
+# ============
+#
+# Assuming we check out trunk or branch-XXX with the command
+#	'svn co URL/BRANCH/'
+# then this script will be $PWD/test/patch-django and we will place our patched
+# django in $PWD/test/lib/django
+#
+
+say "Setting up a local Django for the test suite"
+cd $build
+
+django=$(py_module_path "django")
+rsync -av $django $build/test/lib/
+cd $build/test/lib
+for patch in $build/test/*.patch; do
+    patch -p 3 -t -N < $patch
+done
+
+# Database setup
+# ==============
+
+#say "Setting up a database for the test suite"
+
+# Project Setup
+# =============
+# put in place a suitable settings_local.py for our application to find.  This should
+# be based on the local settings_local.py, but should add test-specific settings, and
+# should set things up so that we use the patched Django, not the system's default
+# Django.
+
+say "Setting up the Django settings for the test suite"
+cd $build
+
+settings_local=$(py_module_file "settings_local")
+[ "$settings_local" ] || err
+
+cat $settings_local test/settings_local_test.py - > ietf/settings_local.py
+
+
+exit $warnings

test/test-teardown

@@ -0,0 +1,22 @@
+#!/bin/bash
+#
+# This script expects to be started by a Buildbot slave with PWD set to the build 
+# directory.
+
+# Script Setup
+# ============
+
+program=${0##*/}
+progdir=${0%/*}
+build=$PWD
+
+. $progdir/shell-utils
+
+# Database Cleanup
+# Make sure the test database has been removed
+python ietf/manage.py dbshell <<-EOT
+	drop database test_ietf;
+	exit;
+	EOT
+
+exit $warnings