cli: validate master option for 'statuslog' and 'statusgui' commands

For 'buildbot statuslog' and 'buildbot statusgui' subcommands, validate
master (-m, --master) option. If not valid print user friendly
error message "master must have the form 'hostname:port'".

master/buildbot/scripts/runner.py

@@ -235,6 +235,11 @@ def parseArgs(self, *args):
         if len(args) > 1:
             raise usage.UsageError("I wasn't expecting so many arguments")
 
+    def postOptions(self):
+        base.SubcommandOptions.postOptions(self)
+        validate_master_option(self.get('master'))
+
+
 
 class StatusLogOptions(BaseStatusClientOptions):
     subcommandFunction = "buildbot.scripts.statuslog.statuslog"

master/buildbot/test/unit/test_scripts_runner.py

@@ -335,23 +335,24 @@ def parse(self, *args):
         return self.opts
 
     def test_defaults(self):
-        opts = self.parse('--master', 'm')
-        exp = dict(master='m', username='statusClient', passwd='clientpw')
+        opts = self.parse('--master', 'm:20')
+        exp = dict(master='m:20', username='statusClient', passwd='clientpw')
         self.assertOptions(opts, exp)
 
     def test_short(self):
-        opts = self.parse('-m', 'm', '-u', 'u', '-p', 'p')
-        exp = dict(master='m', username='u', passwd='p')
+        opts = self.parse('-m', 'm:20', '-u', 'u', '-p', 'p')
+        exp = dict(master='m:20', username='u', passwd='p')
         self.assertOptions(opts, exp)
 
     def test_long(self):
-        opts = self.parse('--master', 'm', '--username', 'u', '--passwd', 'p')
-        exp = dict(master='m', username='u', passwd='p')
+        opts = self.parse('--master', 'm:20',
+                          '--username', 'u', '--passwd', 'p')
+        exp = dict(master='m:20', username='u', passwd='p')
         self.assertOptions(opts, exp)
 
     def test_positional_master(self):
-        opts = self.parse('--username', 'u', '--passwd', 'p', 'm')
-        exp = dict(master='m', username='u', passwd='p')
+        opts = self.parse('--username', 'u', '--passwd', 'p', 'm:20')
+        exp = dict(master='m:20', username='u', passwd='p')
         self.assertOptions(opts, exp)
 
     def test_positional_extra(self):
@@ -362,11 +363,14 @@ def test_missing_master(self):
         self.assertRaises(usage.UsageError,
             lambda : self.parse('--username', 'u', '--passwd', 'p'))
 
+    def test_invalid_master(self):
+        self.assertRaises(usage.UsageError, self.parse, "-m foo")
+
     def test_options_masterstatus(self):
-        self.options_file['master'] = 'not seen'
-        self.options_file['masterstatus'] = 'opt'
+        self.options_file['master'] = 'not_seen:2'
+        self.options_file['masterstatus'] = 'opt:3'
         opts = self.parse('-p', 'pass', '-u', 'user')
-        exp = dict(master='opt', username='user', passwd='pass')
+        exp = dict(master='opt:3', username='user', passwd='pass')
         self.assertOptions(opts, exp)