s/validate_master_option/validateMasterOption/

buildbot · Apr 14, 2013 · 39620ef · 39620ef
1 parent a9e3398
commit 39620ef
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/master/buildbot/scripts/runner.py b/master/buildbot/scripts/runner.py
@@ -30,8 +30,9 @@
 # Note that the terms 'options' and 'config' are used interchangeably here - in
 # fact, they are interchanged several times.  Caveat legator.
 
-def validate_master_option(master):
-    """Validate master (-m, --master) command line option.
+def validateMasterOption(master):
+    """
+    Validate master (-m, --master) command line option.
 
     Checks that option is a string of the 'hostname:port' form, otherwise
     raises an UsageError exception.
@@ -214,7 +215,7 @@ def parseArgs(self, *args):
 
     def postOptions(self):
         base.SubcommandOptions.postOptions(self)
-        validate_master_option(self.get('master'))
+        validateMasterOption(self.get('master'))
 
 
 class BaseStatusClientOptions(base.SubcommandOptions):
@@ -241,7 +242,7 @@ def parseArgs(self, *args):
 
     def postOptions(self):
         base.SubcommandOptions.postOptions(self)
-        validate_master_option(self.get('master'))
+        validateMasterOption(self.get('master'))
 
 
 
@@ -348,7 +349,7 @@ def postOptions(self):
         if self.get('vc') and self.get('vc') not in vcs:
             raise usage.UsageError("vc must be one of %s" % (', '.join(vcs)))
 
-        validate_master_option(self.get('master'))
+        validateMasterOption(self.get('master'))
 
 class TryOptions(base.SubcommandOptions):
     subcommandFunction = "buildbot.scripts.trycmd.trycmd"
@@ -493,7 +494,7 @@ def postOptions(self):
             if not self['master']:
                 raise usage.UsageError("master location must be specified" \
                                        "for 'pb' connections")
-            validate_master_option(self['master'])
+            validateMasterOption(self['master'])
 
 
 class TryServerOptions(base.SubcommandOptions):
@@ -613,7 +614,7 @@ def _checkValidTypes(self, info):
     def postOptions(self):
         base.SubcommandOptions.postOptions(self)
 
-        validate_master_option(self.get('master'))
+        validateMasterOption(self.get('master'))
 
         op = self.get('op')
         if not op:

diff --git a/master/buildbot/test/unit/test_scripts_runner.py b/master/buildbot/test/unit/test_scripts_runner.py
@@ -549,10 +549,18 @@ def test_config_options(self):
                 buildbotbin='.virtualenvs/buildbot/bin/buildbot')
         self.assertOptions(opts, exp)
 
-    def test_pb_no_master(self):
+    def test_pb_withNoMaster(self):
+        """
+        When 'builbot try' is asked to connect via pb, but no master is
+        specified, a usage error is raised.
+        """
         self.assertRaises(usage.UsageError, self.parse, '--connect=pb')
 
-    def test_master_inval(self):
+    def test_pb_withInvalidMaster(self):
+        """
+        When 'buildbot try' is asked to conncect via pb, but an invalid
+        master is specified, a usage error is raised.
+        """
         self.assertRaises(usage.UsageError, self.parse,
                           '--connect=pb', '--master=foo')