Launchpad itself

Merge ~twom/launchpad:questions-about-storm-subscriptions into launchpad:master

  1. Git
  2. lp:~twom/launchpad
  3. questions-about-storm-subscriptions
  4. Merge into master
Proposed by Tom Wardill
Status: Merged
Approved by: Tom Wardill
Approved revision: ceaabb252989c70f1893b714c238f5ac7744d805
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~twom/launchpad:questions-about-storm-subscriptions
Merge into: launchpad:master
Diff against target: 52 lines (+4/-4)
4 files modified
lib/lp/answers/browser/tests/views.txt (+1/-1)
lib/lp/answers/doc/expiration.txt (+1/-1)
lib/lp/answers/doc/notifications.txt (+1/-1)
lib/lp/answers/doc/person.txt (+1/-1)
Reviewer Review Type Date Requested Status
Ioana Lasc (community) Approve
Review via email: mp+386081@code.launchpad.net

Commit message

Fix model representation in doc tests

To post a comment you must log in.
Revision history for this message
Ioana Lasc (ilasc) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/answers/browser/tests/views.txt b/lib/lp/answers/browser/tests/views.txt
2index 6056091..f552ca4 100644
3--- a/lib/lp/answers/browser/tests/views.txt
4+++ b/lib/lp/answers/browser/tests/views.txt
5@@ -17,7 +17,7 @@ Several views are used to handle the various operations on a question.
6
7 >>> login('test@canonical.com')
8 >>> firefox_question.subscribe(firefox_question.owner)
9- <QuestionSubscription...>
10+ <lp.answers.model.questionsubscription.QuestionSubscription...>
11
12
13 QuestionSubscriptionView
14diff --git a/lib/lp/answers/doc/expiration.txt b/lib/lp/answers/doc/expiration.txt
15index 7995e7d..bacb58c 100644
16--- a/lib/lp/answers/doc/expiration.txt
17+++ b/lib/lp/answers/doc/expiration.txt
18@@ -80,7 +80,7 @@ somebody are subject to expiration.
19 # to make sure that DB permissions are correct.
20 >>> admin_team = getUtility(IPersonSet).getByName('admins')
21 >>> old_open_question.subscribe(admin_team)
22- <QuestionSubscription...>
23+ <lp.answers.model.questionsubscription.QuestionSubscription...>
24 >>> salgado = getUtility(IPersonSet).getByName('salgado')
25 >>> old_open_question.target.addAnswerContact(salgado, salgado)
26 True
27diff --git a/lib/lp/answers/doc/notifications.txt b/lib/lp/answers/doc/notifications.txt
28index fe7a24d..0faaa18 100644
29--- a/lib/lp/answers/doc/notifications.txt
30+++ b/lib/lp/answers/doc/notifications.txt
31@@ -310,7 +310,7 @@ giveInfo() transitions, let's see the other ones.
32 # sent.
33
34 >>> ubuntu_question.subscribe(sample_person)
35- <QuestionSubscription ...>
36+ <lp.answers.model.questionsubscription.QuestionSubscription ...>
37
38
39 Notifications for expireQuestion()
40diff --git a/lib/lp/answers/doc/person.txt b/lib/lp/answers/doc/person.txt
41index 4993f76..2a33486 100644
42--- a/lib/lp/answers/doc/person.txt
43+++ b/lib/lp/answers/doc/person.txt
44@@ -226,7 +226,7 @@ subscribed to...
45 >>> pt_BR_question = getUtility(IQuestionSet).get(13)
46 >>> login('foo.bar@canonical.com')
47 >>> pt_BR_question.subscribe(foo_bar_raw)
48- <QuestionSubscription...>
49+ <lp.answers.model.questionsubscription.QuestionSubscription...>
50
51 >>> print(', '.join(
52 ... sorted(language.code

Subscribers

People subscribed via source and target branches

to status/vote changes: