Merge branch 'upgrade-slave-chk-basedir' of git://github.com/elmirjag…

…udin/buildbot

slave/buildslave/scripts/runner.py

@@ -307,6 +307,11 @@ def getSynopsis(self):
 
 def upgradeSlave(config):
     basedir = os.path.expanduser(config['basedir'])
+
+    if not isBuildslaveDir(basedir):
+        print "not a buildslave directory"
+        sys.exit(1)
+
     buildbot_tac = open(os.path.join(basedir, "buildbot.tac")).read()
     new_buildbot_tac = buildbot_tac.replace(
         "from buildbot.slave.bot import BuildSlave",

slave/buildslave/test/unit/test_scripts_runner.py

@@ -0,0 +1,53 @@
+# This file is part of Buildbot.  Buildbot is free software: you can
+# redistribute it and/or modify it under the terms of the GNU General Public
+# License as published by the Free Software Foundation, version 2.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc., 51
+# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Copyright Buildbot Team Members
+
+import sys
+import mock
+import cStringIO
+from twisted.trial import unittest
+from buildslave.scripts import runner
+
+class TestUpgradeSlave(unittest.TestCase):
+    """
+    Test buildslave.scripts.runner.upgradeSlave()
+    """
+
+    def test_upgradeSlave_bad_basedir(self):
+        """
+        test calling upgradeSlave() with bad base directory
+        """
+
+        # capture output to stdout
+        mocked_stdout = cStringIO.StringIO()
+        self.patch(sys, 'stdout', mocked_stdout)
+
+        # override isBuildslaveDir
+        mocked_isBuildslaveDir = mock.Mock(return_value=False)
+        self.patch(runner, "isBuildslaveDir", mocked_isBuildslaveDir)
+
+        # call upgradeSlave() and check that SystemExit exception is raised
+        config = {"basedir" : "dummy"}
+        exception = self.assertRaises(SystemExit, runner.upgradeSlave, config)
+
+        # check exit code
+        self.assertEqual(exception.code, 1, "unexpected exit code")
+
+        # check that isBuildslaveDir was called with correct argument
+        mocked_isBuildslaveDir.assert_called_once_with("dummy")
+
+        # check that correct error message was printed to stdout
+        self.assertEqual(mocked_stdout.getvalue(),
+                         "not a buildslave directory\n",
+                         "unexpected error message on stdout")