From 8d760b02f2879cd969d0de961d29d946a1fe6bf2 Mon Sep 17 00:00:00 2001
From: Dylan Rajaratnam <thedylman@gmail.com>
Date: Sun, 25 Jan 2015 13:50:29 +0000
Subject: [PATCH] use buildbot.tac from the current directory as default for
 checkconfig

---
 master/buildbot/scripts/checkconfig.py             |  2 +-
 master/buildbot/scripts/runner.py                  |  5 ++---
 .../buildbot/test/unit/test_scripts_checkconfig.py | 14 +++++++++++---
 master/buildbot/test/unit/test_scripts_runner.py   |  4 ++--
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/master/buildbot/scripts/checkconfig.py b/master/buildbot/scripts/checkconfig.py
index 16d746f4b3c..a91a3a50d36 100644
--- a/master/buildbot/scripts/checkconfig.py
+++ b/master/buildbot/scripts/checkconfig.py
@@ -38,7 +38,7 @@ def _loadConfig(basedir, configFile, quiet):
 
 def checkconfig(config):
     quiet = config.get('quiet')
-    configFile = config.get('configFile')
+    configFile = config.get('configFile', os.getcwd())
 
     if os.path.isdir(configFile):
         basedir = configFile
diff --git a/master/buildbot/scripts/runner.py b/master/buildbot/scripts/runner.py
index 96e4388a35d..202ab2cc82a 100644
--- a/master/buildbot/scripts/runner.py
+++ b/master/buildbot/scripts/runner.py
@@ -487,13 +487,12 @@ class CheckConfigOptions(base.SubcommandOptions):
 
     def getSynopsis(self):
         return "Usage:\t\tbuildbot checkconfig [configFile]\n" + \
-            "\t\tIf not specified, 'master.cfg' will be used as 'configFile'"
+            "\t\tIf not specified, the config file specified in " + \
+            "'buildbot.tac' from the current directory will be used"
 
     def parseArgs(self, *args):
         if len(args) >= 1:
             self['configFile'] = args[0]
-        else:
-            self['configFile'] = 'master.cfg'
 
 
 class UserOptions(base.SubcommandOptions):
diff --git a/master/buildbot/test/unit/test_scripts_checkconfig.py b/master/buildbot/test/unit/test_scripts_checkconfig.py
index 8e5103dd2b1..5198e882355 100644
--- a/master/buildbot/test/unit/test_scripts_checkconfig.py
+++ b/master/buildbot/test/unit/test_scripts_checkconfig.py
@@ -147,19 +147,27 @@ def setUp(self):
         self.loadConfig = mock.Mock(spec=checkconfig._loadConfig, return_value=3)
         self.patch(checkconfig, '_loadConfig', self.loadConfig)
 
+    def test_checkconfig_default(self):
+        self.assertEqual(checkconfig.checkconfig(dict()), 3)
+        self.loadConfig.assert_called_with(basedir=os.getcwd(),
+                                           configFile='master.cfg', quiet=None)
+
     def test_checkconfig_given_dir(self):
         self.assertEqual(checkconfig.checkconfig(dict(configFile='.')), 3)
-        self.loadConfig.assert_called_with(basedir='.', configFile='master.cfg', quiet=None)
+        self.loadConfig.assert_called_with(basedir='.', configFile='master.cfg',
+                                           quiet=None)
 
     def test_checkconfig_given_file(self):
         config = dict(configFile='master.cfg')
         self.assertEqual(checkconfig.checkconfig(config), 3)
-        self.loadConfig.assert_called_with(basedir=os.getcwd(), configFile='master.cfg', quiet=None)
+        self.loadConfig.assert_called_with(basedir=os.getcwd(),
+                                           configFile='master.cfg', quiet=None)
 
     def test_checkconfig_quiet(self):
         config = dict(configFile='master.cfg', quiet=True)
         self.assertEqual(checkconfig.checkconfig(config), 3)
-        self.loadConfig.assert_called_with(basedir=os.getcwd(), configFile='master.cfg', quiet=True)
+        self.loadConfig.assert_called_with(basedir=os.getcwd(),
+                                           configFile='master.cfg', quiet=True)
 
     def test_checkconfig_syntaxError_quiet(self):
         """
diff --git a/master/buildbot/test/unit/test_scripts_runner.py b/master/buildbot/test/unit/test_scripts_runner.py
index afc40d3db68..cabedb8fe60 100644
--- a/master/buildbot/test/unit/test_scripts_runner.py
+++ b/master/buildbot/test/unit/test_scripts_runner.py
@@ -595,7 +595,7 @@ def test_synopsis(self):
 
     def test_defaults(self):
         opts = self.parse()
-        exp = dict(quiet=False, configFile='master.cfg')
+        exp = dict(quiet=False)
         self.assertOptions(opts, exp)
 
     def test_configfile(self):
@@ -605,7 +605,7 @@ def test_configfile(self):
 
     def test_quiet(self):
         opts = self.parse('-q')
-        exp = dict(quiet=True, configFile='master.cfg')
+        exp = dict(quiet=True)
         self.assertOptions(opts, exp)