← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~cjwatson/launchpad:cibuild-improve-logging into launchpad:master

 

Colin Watson has proposed merging ~cjwatson/launchpad:cibuild-improve-logging into launchpad:master.

Commit message:
Pass logger from CIBuildSet.requestBuildsForRefs to hosting client

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/417798

This allows us to see a little more logging about which commit details are being requested.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:cibuild-improve-logging into launchpad:master.
diff --git a/lib/lp/code/model/cibuild.py b/lib/lp/code/model/cibuild.py
index 785b1cc..afd4830 100644
--- a/lib/lp/code/model/cibuild.py
+++ b/lib/lp/code/model/cibuild.py
@@ -489,7 +489,7 @@ class CIBuildSet(SpecificBuildFarmJobSourceMixin):
             # debian/.launchpad.yaml (or perhaps make the path a property of
             # the repository) once lpcraft and launchpad-buildd support
             # using alternative paths for builds.
-            filter_paths=[".launchpad.yaml"])
+            filter_paths=[".launchpad.yaml"], logger=logger)
         for commit in commits:
             try:
                 configuration = parse_configuration(
diff --git a/lib/lp/code/model/tests/test_cibuild.py b/lib/lp/code/model/tests/test_cibuild.py
index 91b24a2..e49e23e 100644
--- a/lib/lp/code/model/tests/test_cibuild.py
+++ b/lib/lp/code/model/tests/test_cibuild.py
@@ -529,7 +529,7 @@ class TestCIBuildSet(TestCaseWithFactory):
 
         self.assertEqual(
             [((repository.getInternalPath(), [ref.commit_sha1]),
-              {"filter_paths": [".launchpad.yaml"]})],
+              {"filter_paths": [".launchpad.yaml"], "logger": None})],
             hosting_fixture.getCommits.calls
         )
 
@@ -559,7 +559,7 @@ class TestCIBuildSet(TestCaseWithFactory):
 
         self.assertEqual(
             [((repository.getInternalPath(), []),
-              {"filter_paths": [".launchpad.yaml"]})],
+              {"filter_paths": [".launchpad.yaml"], "logger": None})],
             hosting_fixture.getCommits.calls
         )
 
@@ -583,7 +583,7 @@ class TestCIBuildSet(TestCaseWithFactory):
 
         self.assertEqual(
             [((repository.getInternalPath(), [ref.commit_sha1]),
-              {"filter_paths": [".launchpad.yaml"]})],
+              {"filter_paths": [".launchpad.yaml"], "logger": None})],
             hosting_fixture.getCommits.calls
         )
 
@@ -625,7 +625,7 @@ class TestCIBuildSet(TestCaseWithFactory):
 
         self.assertEqual(
             [((repository.getInternalPath(), [ref.commit_sha1]),
-              {"filter_paths": [".launchpad.yaml"]})],
+              {"filter_paths": [".launchpad.yaml"], "logger": logger})],
             hosting_fixture.getCommits.calls
         )
 
@@ -683,7 +683,7 @@ class TestCIBuildSet(TestCaseWithFactory):
 
         self.assertEqual(
             [((repository.getInternalPath(), [ref.commit_sha1]),
-              {"filter_paths": [".launchpad.yaml"]})],
+              {"filter_paths": [".launchpad.yaml"], "logger": logger})],
             hosting_fixture.getCommits.calls
         )
 
@@ -739,7 +739,7 @@ class TestCIBuildSet(TestCaseWithFactory):
 
         self.assertEqual(
             [((repository.getInternalPath(), [ref.commit_sha1]),
-              {"filter_paths": [".launchpad.yaml"]})],
+              {"filter_paths": [".launchpad.yaml"], "logger": logger})],
             hosting_fixture.getCommits.calls
         )