Merge lp:~thumper/launchpad/fix-factory-ids-in-tests into lp:launchpad

[Tim Penhey]

Fixes the code tests so they don't depend on factory generated values.

Fixing the tests so they don't depend on factory generated values.

xx-branch-index
branch-karma.txt

[Paul Hummer (rockstar)]

Land it. Land it now.

review: Approve (code)

=== modified file 'lib/lp/code/doc/branch-karma.txt'
--- lib/lp/code/doc/branch-karma.txt	2010-03-26 20:35:31 +0000
+++ lib/lp/code/doc/branch-karma.txt	2010-05-11 03:25:36 +0000
@@ -48,8 +48,9 @@
 
 You get karma for linking a bug to a branch.
 
-    >>> bug = factory.makeBug(product=fooix)
-    Karma added: action=bugcreated, product=fooix, person=person-name11
+    >>> reporter = factory.makePerson(name='reporter')
+    >>> bug = factory.makeBug(product=fooix, owner=reporter)
+    Karma added: action=bugcreated, product=fooix, person=reporter
     >>> branch_link = bug.linkBranch(branch, eric)
     Karma added: action=bugbranchcreated, product=fooix, person=eric
 

=== modified file 'lib/lp/code/stories/branches/xx-branch-index.txt'
--- lib/lp/code/stories/branches/xx-branch-index.txt	2010-02-17 07:44:48 +0000
+++ lib/lp/code/stories/branches/xx-branch-index.txt	2010-05-11 03:25:36 +0000
@@ -13,17 +13,14 @@
 
 Modifying/creating test data for this test case.
 
-    >>> login('[e-mail]')
-    >>> branch = getUtility(IBranchLookup).getByUniqueName(
-    ...     '~name12/+junk/junk.dev')
-    >>> factory.makeRevisionsForBranch(branch, count=5)
-    >>> sample_person = getUtility(IPersonSet).getByName('name12')
-    >>> anonymous_product = factory.makeProduct(
-    ...     name='anonymous-product', owner=sample_person)
-    >>> anonymous_branch = factory.makeProductBranch(
-    ...     name='anonymous-branch', product=anonymous_product,
-    ...     owner=sample_person)
-    >>> anonymous_product.setAliases(['alias-for-product'])
+    >>> login('[e-mail]')
+    >>> eric = factory.makePerson(name='eric', email='[e-mail]')
+    >>> fooix = factory.makeProduct(name='fooix', owner=eric)
+    >>> branch = factory.makeProductBranch(
+    ...     name='trunk', product=fooix, owner=eric)
+    >>> fooix.setAliases(['fooey'])
+    >>> factory.makeRevisionsForBranch(
+    ...     branch, count=5, author='[e-mail]')
     >>> logout()
 
 
@@ -34,21 +31,19 @@
 name or any of its aliases.  In case an alias is used, the user is redirected
 to the branch's canonical URL -- the one which uses the product name.
 
-    >>> anon_browser.open('http://code.launchpad.dev/~name12/anonymous-product'
-    ...                   '/anonymous-branch')
-    >>> anon_browser.url
-    'http://code.launchpad.dev/~name12/anonymous-product/anonymous-branch'
-    >>> anon_browser.open('http://code.launchpad.dev/~name12/alias-for-product'
-    ...                   '/anonymous-branch')
-    >>> anon_browser.url
-    'http://code.launchpad.dev/~name12/anonymous-product/anonymous-branch'
+    >>> anon_browser.open('http://code.launchpad.dev/~eric/fooix/trunk')
+    >>> anon_browser.url
+    'http://code.launchpad.dev/~eric/fooix/trunk'
+    >>> anon_browser.open('http://code.launchpad.dev/~eric/fooey/trunk')
+    >>> anon_browser.url
+    'http://code.launchpad.dev/~eric/fooix/trunk'
 
 
 == Recent Revisions ==
 
 We display the recent revisions of a branch if it has been scanned.
 
-    >>> user_browser.open('http://code.launchpad.dev/~name12/+junk/junk.dev')
+    >>> user_browser.open('http://code.launchpad.dev/~eric/fooix/trunk')
     >>> assert find_tag_by_id(user_browser.contents, 'merge-summary') is None
     >>> revisions = find_tag_by_id(user_browser.contents, 'recent-revisions')
     >>> def print_merge_links(browser):
@@ -75,24 +70,18 @@
     ...         print extract_text(revision).encode('ascii')
 
     >>> print_revisions(user_browser)
-    11. By author1 on 2007-01-05
-    10. By author1 on 2007-01-04
-    9. By author1 on 2007-01-03
-    8. By author1 on 2007-01-02
-    7. By author1 on 2007-01-01
-    6. By foo <foo@localhost> on 2005-10-31
-    5. By foo <foo@localhost> on 2005-10-31
-    4. By bar@localhost on 2005-10-31
-    3. By Sample Person on 2005-10-31
-    2. By Sample Person on 2005-10-31
+    5. By Eric on 2007-01-05
+    4. By Eric on 2007-01-04
+    3. By Eric on 2007-01-03
+    2. By Eric on 2007-01-02
+    1. By Eric on 2007-01-01
 
-Each of the revision numbers are now anchors to codebrowse (for public
-branches).
+Each of the revision numbers are anchors to codebrowse.
 
     >>> revision = find_tags_by_class(
     ...         user_browser.contents, 'revision-details', only_first=True)
     >>> print revision.a
-    <a href="http://bazaar.launchpad.dev/~name12/+junk/junk.dev/revision/11">11</a>
+    <a href="http://bazaar.launchpad.dev/~eric/fooix/trunk/revision/5">5</a>
 
 
 === Commit messages ===
@@ -104,13 +93,13 @@
     >>> commit_messages = find_tags_by_class(
     ...         browser.contents, 'revision-comment')
     >>> print commit_messages[0].p.renderContents()
-    log-body11
+    fix bug in bar
 
 
 When a commit message refers to a bug using the form "bug <bugnumber>", a link
 to that bug is created.
 
-    >>> print commit_messages[8].p.renderContents()
+    >>> print commit_messages[3].p.renderContents()
     fix <a ...>bug 1</a>
 
 
@@ -285,21 +274,11 @@
     Recent revisions
     This branch is empty.
 
-Sample Person's junk branch has some revisions, so the revisions are linked to
-the revisions are linked to the code.
-
-    >>> browser.open(
-    ...     'http://code.launchpad.dev/~name12/+junk/junk.dev')
-    >>> print extract_text(find_tag_by_id(
-    ...     browser.contents, "recent-revisions").dl)
-    11. By author1 on ...
-    6. By foo... fix bug in bar...
-    >>> print browser.getLink('11').url
-    http://bazaar.launchpad.dev/~name12/+junk/junk.dev/revision/11
-
 In addition, there is a "All revisions" link that links to the
 changelog view in codebrowse.
 
+    >>> browser.open(
+    ...     'http://code.launchpad.dev/~name12/+junk/junk.dev')
     >>> print browser.getLink('All revisions').url
     http://bazaar.launchpad.dev/~name12/+junk/junk.dev/changes