launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging lp:~cjwatson/launchpad/test-no-sequence-deps-buildmaster into lp:launchpad.

Commit message:
Fix TestFailureAssessments.test_bad_builder to cope with sequences not being reset between tests.

Requested reviews:
  Colin Watson (cjwatson)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/test-no-sequence-deps-buildmaster/+merge/273447

Fix TestFailureAssessments.test_bad_builder to cope with sequences not being reset between tests.
-- 
Your team Launchpad code reviewers is subscribed to branch lp:launchpad.

=== modified file 'lib/lp/buildmaster/tests/test_manager.py'
--- lib/lp/buildmaster/tests/test_manager.py	2015-02-17 09:33:33 +0000
+++ lib/lp/buildmaster/tests/test_manager.py	2015-10-05 17:26:20 +0000
@@ -1147,7 +1147,7 @@
         self.builder.failure_count = BUILDER_FAILURE_THRESHOLD - 1
         self.assertIsNot(None, self.builder.currentjob)
         log = self._recover_failure("failnotes")
-        self.assertIn("Requeueing job RECIPEBRANCHBUILD-1", log)
+        self.assertIn("Requeueing job %s" % self.build.build_cookie, log)
         self.assertIn("Dirtying builder %s" % self.builder.name, log)
         self.assertIs(None, self.builder.currentjob)
         self.assertEqual(BuilderCleanStatus.DIRTY, self.builder.clean_status)