Merge lp:~abentley/launchpad/stable-test-failures2 into lp:launchpad

Proposed by Aaron Bentley
Status: Merged
Merged at revision: 14764
Proposed branch: lp:~abentley/launchpad/stable-test-failures2
Merge into: lp:launchpad
Diff against target: 12 lines (+1/-1)
1 file modified
lib/lp/services/webapp/doc/test_adapter.txt (+1/-1)
To merge this branch: bzr merge lp:~abentley/launchpad/stable-test-failures2
Reviewer Review Type Date Requested Status
Abel Deuring (community) code Approve
Review via email: mp+92047@code.launchpad.net

Commit message

Fix intermittant test failure.

Description of the change

= Summary =
Fix bug #928308: timing-dependent failures in test_adapter.txt

== Proposed fix ==
Allow any arbitrary end time.

== Pre-implementation notes ==
None

== Implementation details ==
None

== Tests ==
bin/test -vt test_adapter.txt

== Demo and Q/A ==
None

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/lp/services/webapp/doc/test_adapter.txt

To post a comment you must log in.
Revision history for this message
Abel Deuring (adeuring) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/services/webapp/doc/test_adapter.txt'
2--- lib/lp/services/webapp/doc/test_adapter.txt 2011-12-30 06:47:17 +0000
3+++ lib/lp/services/webapp/doc/test_adapter.txt 2012-02-08 15:23:28 +0000
4@@ -338,7 +338,7 @@
5 the database.
6
7 >>> get_request_statements()
8- [(0, 0, 'SQL-main-master', 'SELECT 2', ...)]
9+ [(0, ..., 'SQL-main-master', 'SELECT 2', ...)]
10
11
12 When a RequestExpired exception is raised, the current