Merge lp:~bigkevmcd/offspring/fix-bug-917361 into lp:offspring

[Kevin McDermott]

This adds tests and a fix for this bug.

[Kevin McDermott (bigkevmcd)]

Ideally, we'd make the master call a No-Op version of the slave to avoid these issues, but this would need to be asynchronous (and out-of process?)

[Guilherme Salgado (salgado)]

Thanks a lot for taking care of this, Kevin. It looks good to me.

 review approve

review: Approve

=== modified file 'lib/offspring/slave/slave.py'
--- lib/offspring/slave/slave.py	2011-12-09 17:07:43 +0000
+++ lib/offspring/slave/slave.py	2012-01-24 17:52:23 +0000
@@ -132,13 +132,14 @@
             self, addr, requestHandler, logRequests, allow_none, encoding,
             request_timeout)
 
-    def api_startBuild(self, projectName, configBranchURL):
+    def api_startBuild(self, projectName, configBranchURL, lpUser=None,
+                       lpSSHKey=None):
         """
         Start building the project on the LexbuilderSlave.
         """
         if self.slave.currentBuildIsActive():
             return LexbuilderSlaveServer.REQUEST_ERROR
-        self.slave.startBuild(projectName, configBranchURL)
+        self.slave.startBuild(projectName, configBranchURL, lpUser, lpSSHKey)
         return LexbuilderSlaveServer.REQUEST_OKAY
 
     def api_stopBuild(self):

=== modified file 'lib/offspring/slave/tests/test_slave.py'
--- lib/offspring/slave/tests/test_slave.py	2012-01-11 08:08:10 +0000
+++ lib/offspring/slave/tests/test_slave.py	2012-01-24 17:52:23 +0000
@@ -193,7 +193,6 @@
         to be valid for this test.
 
         """
-
         # Set up a fake build process (starts off in STATE_ACTIVE)
         self.slave.currentBuild = FakeProjectBuildProcess()
 
@@ -352,9 +351,12 @@
         self.state = state
         self.config = config
 
-    def startBuild(self, project_name, config_url):
+    def startBuild(self, project_name, config_url, lp_user=None,
+                   lp_sshkey=None):
         self.project_name = project_name
         self.config_url = config_url
+        self.lp_user = lp_user
+        self.private_key = lp_sshkey
         self.started = True
 
     def stopBuild(self):
@@ -456,6 +458,25 @@
         self.assertFalse(self.fake_slave.project_name)
         self.assertFalse(self.fake_slave.config_url)
 
+    def test_api_start_build_with_private_project_details(self):
+        """
+        If the lpSSHKey and lpUser are supplied, then these should be passed to
+        the underlying SlaveServer.
+        """
+        self.fake_slave.currentBuild = FakeBuild()
+        slave_server = self.create_slave_server()
+
+        response = slave_server.api_startBuild("testing",
+                                               "http://example.com/",
+                                               "testing",
+                                               "private_key")
+        self.assertEqual(LexbuilderSlaveServer.REQUEST_OKAY, response)
+        self.assertEqual("testing", self.fake_slave.project_name)
+        self.assertEqual("http://example.com/", self.fake_slave.config_url)
+        self.assertEqual("testing", self.fake_slave.lp_user)
+        self.assertEqual("private_key", self.fake_slave.private_key)
+        self.assertTrue(self.fake_slave.started)
+
     def test_api_stop_build(self):
         """
         If the SlaveServer has an active build, api_stopBuild should end the