Changeset 585

Timestamp:

03/27/08 21:50:38 (10 months ago)

Author:

warner@lothar.com

Message:

add 'buildbot checkconfig' command from Ben Hearsum

Files:

• ChangeLog (modified) (1 diff)
• buildbot/scripts/checkconfig.py (added)
• buildbot/scripts/runner.py (modified) (4 diffs)
• docs/buildbot.texinfo (modified) (4 diffs)

ChangeLog

@@ +1 @@
+2008-03-27  Brian Warner  <warner@lothar.com>
+
+        * buildbot/scripts/runner.py (doCheckConfig): patch from Ben
+        Hearsum to implement 'buildbot checkconfig': validate that your
+        master.cfg is good without actually touching the buildmaster.
+        Closes #37. Thanks!
+        * buildbot/scripts/checkconfig.py: same
+        * docs/buildbot.texinfo (Testing the Config File): document it
+
-2008-03-22  Brian Warner  <warner@lothar.com>
-

buildbot/scripts/runner.py

@@ -4 +4 @@
-# subcommands want to load modules that need the gtk reactor.
-import os, sys, stat, re, time
+import traceback
-from twisted.python import usage, util, runtime
-
@@ -810 +811 @@
-
-
+class CheckConfigOptions(usage.Options):
+    optFlags = [
+        ['quiet', 'q', "Don't display error messages or tracebacks"],
+    ]
+
+    def getSynopsis(self):
+        return "Usage           :buildbot checkconfig [configFile]\n" + \
+         "              If not specified, 'master.cfg' will be used as 'configFile'"
+
+    def parseArgs(self, *args):
+        if len(args) >= 1:
+            self['configFile'] = args[0]
+        else:
+            self['configFile'] = 'master.cfg'
+
+
+def doCheckConfig(config):
+    quiet = config.get('quiet')
+    configFile = config.get('configFile')
+    try:
+        from buildbot.scripts.checkconfig import ConfigLoader
+        ConfigLoader(configFile)
+    except:
+        if not quiet:
+            # Print out the traceback in a nice format
+            t, v, tb = sys.exc_info()
+            traceback.print_exception(t, v, tb)
+        sys.exit(1)
+
+    if not quiet:
+        print "Config file is good!"
+
+
-class Options(usage.Options):
-    synopsis = "Usage:    buildbot <command> [command options]"
@@ -847 +881 @@
-        ['tryserver', None, TryServerOptions,
-         "buildmaster-side 'try' support function, not for users"],
+
+        ['checkconfig', None, CheckConfigOptions,
+         "test the validity of a master.cfg config file"],
-
-        # TODO: 'watch'
@@ -907 +944 @@
-    elif command == "tryserver":
-        doTryServer(so)
-
-
+
+
+
+

docs/buildbot.texinfo

@@ -129 +129 @@
-* Config File Format::          
-* Loading the Config File::     
+* Testing the Config File::     
-* Defining the Project::        
-* Listing Change Sources and Schedulers::  
@@ -1923 +1924 @@
-* Config File Format::          
-* Loading the Config File::     
+* Testing the Config File::     
-* Defining the Project::        
-* Listing Change Sources and Schedulers::  
@@ -1995 +1997 @@
-
-
-Defining the Project
+Testing the Config File
-@section Loading the Config File
-
@@ -2029 +2031 @@
-which get queued after the reconfig) will use the new process.
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-@section Defining the Project
-