Merge lp:~julian-edwards/launchpad/missing-slave-method-bug-509383 into lp:launchpad

[Julian Edwards]

[Julian Edwards (julian-edwards)]

= Summary =
Add a method to RecordingSlave that was missed during refactoring

== Proposed fix ==
RecordingSlave is missing _sendFileToSlave(). This was missed out during the
refactoring at the Wellington sprint and causes private builds to fail.

== Implementation details ==
The new method just calls RecordingSlave.ensurepresent so the same test for
that is re-used.

== Tests ==
bin/test -vvct TestRecordingSlaves

== Demo and Q/A ==

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/buildmaster/model/builder.py
  lib/lp/buildmaster/tests/test_manager.py
  lib/lp/soyuz/tests/soyuzbuilddhelpers.py
  lib/lp/buildmaster/manager.py
  lib/lp/soyuz/model/binarypackagebuildbehavior.py

[Brad Crittenden (bac)]

review: Approve (code)

=== modified file 'lib/lp/buildmaster/manager.py'
--- lib/lp/buildmaster/manager.py	2010-01-13 21:04:49 +0000
+++ lib/lp/buildmaster/manager.py	2010-01-20 10:59:14 +0000
@@ -87,6 +87,10 @@
         self.ensurepresent(
             libraryfilealias.content.sha1, libraryfilealias.http_url, '', '')
 
+    def sendFileToSlave(self, *args):
+        """Helper to send a file to this builder."""
+        return self.ensurepresent(*args)
+
     def ensurepresent(self, *args):
         """Download files needed for the build."""
         self.calls.append(('ensurepresent', args))

=== modified file 'lib/lp/buildmaster/model/builder.py'
--- lib/lp/buildmaster/model/builder.py	2010-01-14 03:40:33 +0000
+++ lib/lp/buildmaster/model/builder.py	2010-01-20 10:59:14 +0000
@@ -129,9 +129,9 @@
         logger.debug("Asking builder on %s to ensure it has file %s "
                      "(%s, %s)" % (self.urlbase, libraryfilealias.filename,
                                    url, libraryfilealias.content.sha1))
-        self._sendFileToSlave(url, libraryfilealias.content.sha1)
+        self.sendFileToSlave(libraryfilealias.content.sha1, url)
 
-    def _sendFileToSlave(self, url, sha1, username="", password=""):
+    def sendFileToSlave(self, sha1, url, username="", password=""):
         """Helper to send the file at 'url' with 'sha1' to this builder."""
         present, info = self.ensurepresent(sha1, url, username, password)
         if not present:

=== modified file 'lib/lp/buildmaster/tests/test_manager.py'
--- lib/lp/buildmaster/tests/test_manager.py	2010-01-11 23:43:59 +0000
+++ lib/lp/buildmaster/tests/test_manager.py	2010-01-20 10:59:14 +0000
@@ -56,18 +56,29 @@
         """
         self.assertEqual('<foo:http://foo:8221/rpc>', repr(self.slave))
 
+    def assert_ensurepresent(self, func):
+        """Helper function to test results from calling ensurepresent."""
+        self.assertEqual(
+            [True, 'Download'],
+            func('boing', 'bar', 'baz'))
+        self.assertEqual(
+            [('ensurepresent', ('boing', 'bar', 'baz'))],
+            self.slave.calls)
+
     def test_ensurepresent(self):
         """`RecordingSlave.ensurepresent` always succeeds.
 
         It returns the expected succeed code and records the interaction
         information for later use.
         """
-        self.assertEqual(
-            [True, 'Download'],
-            self.slave.ensurepresent('boing', 'bar', 'baz'))
-        self.assertEqual(
-            [('ensurepresent', ('boing', 'bar', 'baz'))],
-            self.slave.calls)
+        self.assert_ensurepresent(self.slave.ensurepresent)
+
+    def test_sendFileToSlave(self):
+        """RecordingSlave.sendFileToSlave always succeeeds.
+
+        It calls ensurepresent() and hence returns the same results.
+        """
+        self.assert_ensurepresent(self.slave.sendFileToSlave)
 
     def test_build(self):
         """`RecordingSlave.build` always succeeds.

=== modified file 'lib/lp/soyuz/model/binarypackagebuildbehavior.py'
--- lib/lp/soyuz/model/binarypackagebuildbehavior.py	2010-01-14 03:39:27 +0000
+++ lib/lp/soyuz/model/binarypackagebuildbehavior.py	2010-01-20 10:59:14 +0000
@@ -187,8 +187,8 @@
             logger.debug("Asking builder on %s to ensure it has file %s "
                          "(%s, %s)" % (
                             self._builder.url, file_name, url, sha1))
-            self._builder.slave._sendFileToSlave(
-                url, sha1, "buildd", archive.buildd_secret)
+            self._builder.slave.sendFileToSlave(
+                sha1, url,  "buildd", archive.buildd_secret)
 
     def _extraBuildArgs(self, build):
         """

=== modified file 'lib/lp/soyuz/tests/soyuzbuilddhelpers.py'
--- lib/lp/soyuz/tests/soyuzbuilddhelpers.py	2010-01-13 21:04:49 +0000
+++ lib/lp/soyuz/tests/soyuzbuilddhelpers.py	2010-01-20 10:59:14 +0000
@@ -186,14 +186,14 @@
 
         return (stdout, stderr, resume_process.returncode)
 
-    def _sendFileToSlave(self, url, sha1, username="", password=""):
+    def sendFileToSlave(self, sha1, url, username="", password=""):
         present, info = self.ensurepresent(sha1, url, username, password)
         if not present:
             raise CannotFetchFile(url, info)
 
     def cacheFile(self, logger, libraryfilealias):
-        self._sendFileToSlave(
-            libraryfilealias.http_url, libraryfilealias.content.sha1)
+        self.sendFileToSlave(
+            libraryfilealias.content.sha1, libraryfilealias.http_url)
 
 
 class BuildingSlave(OkSlave):