Commits

Olemis Lang committed 3ef4b81

BH Multiproduct #695 : Fixed variable names and other minor typos ... (failures=2)

  • Participants
  • Parent commits cc3cd44
  • Branches t695_commit_ticket_update

Comments (0)

Files changed (1)

File t695/t695_r1534486_commit_ticket_update.tests.func.diff

 # HG changeset patch
-# Parent b34a5a7d744ef21815f571a8d9d1b4f351e8d77d
+# Parent ca9bea4bb7122afbf60e114a3c4d8ed298245f8d
 BH Multiproduct #695 : Commit ticket updater - functional test cases
 
-diff -r b34a5a7d744e bloodhound_multiproduct/tests/functional/versioncontrol.py
+diff -r ca9bea4bb712 bloodhound_multiproduct/tests/functional/versioncontrol.py
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/bloodhound_multiproduct/tests/functional/versioncontrol.py	Sun Dec 08 16:58:24 2013 -0500
++++ b/bloodhound_multiproduct/tests/functional/versioncontrol.py	Sun Dec 08 22:35:01 2013 -0500
 @@ -0,0 +1,197 @@
 +# -*- coding: utf-8 -*-
 +#!/usr/bin/python
 +        self._disable()
 +        super(CommitTicketUpdaterTestCase, self).tearDown()
 +
-+    def find_ticket_changeset_comment(self, pid, tkt_id, changeset):
++    def find_ticket_changeset_comment(self, pid, tkt_id, revision):
 +        """Find ticket traces due to committed changeset.
 +        """
 +        with self.in_product(pid) as (testenv, tester):
 +            tester.go_to_ticket(tkt_id)
 +            tc.find('In <a [^>]*class="changeset" [^>]*>%s.*</a>' % 
-+                    str(changeset.rev))
++                    str(revision))
 +            # TODO: More assertions ?
 +
 +    # Map tickets to products (default=p1)
 +    {Fixes %(p1)s-%(t22)s and %(p1)s-%(t23)s}, and {refs %(p1)s-%(t23)s}.
 +
 +    Changed blah and foo to do this or that. 
-+    {Fixes %(p2)s-%(t24)s and %(p2)s-%t(25)s, and refs %(p1)-%(t26)s}.
++    {Fixes %(p2)s-%(t24)s and %(p2)s-%(t25)s, and refs %(p1)s-%(t26)s}.
 +
 +    Duplicate {re %(p2)s-%(t9)s} should not be added to the list.
 +    """
 +            pid = vars['t%s.product' % str(seqnum)]
 +            tid = vars['t' + str(seqnum)]
 +            # TODO: Find status=closed in UI
-+            self.find_ticket_changeset_comment(pid, tkt_id, changeset)
++            self.find_ticket_changeset_comment(pid, tid, revision)
 +
 +    def test_envelope(self):
 +        """Update tickets when refs enclosed by envelope
 +            pid = vars['t%s.product' % str(seqnum)]
 +            tid = vars['t' + str(seqnum)]
 +            # TODO: Find status=closed in UI
-+            self.find_ticket_changeset_comment(pid, tkt_id, changeset)
++            self.find_ticket_changeset_comment(pid, tid, revision)
 +
 +    def test_check_links(self):
 +        """Do not update tickets in unlinked products
 +if __name__ == '__main__':
 +    __import__('unittest').main(defaultTest='functionalSuite')
 +
-diff -r b34a5a7d744e trac/trac/tests/functional/svntestenv.py
---- a/trac/trac/tests/functional/svntestenv.py	Sun Dec 08 12:15:04 2013 -0500
-+++ b/trac/trac/tests/functional/svntestenv.py	Sun Dec 08 16:58:24 2013 -0500
+diff -r ca9bea4bb712 trac/trac/tests/functional/svntestenv.py
+--- a/trac/trac/tests/functional/svntestenv.py	Sun Dec 08 19:17:10 2013 -0500
++++ b/trac/trac/tests/functional/svntestenv.py	Sun Dec 08 22:35:01 2013 -0500
 @@ -52,7 +52,7 @@
                  + [self.repo_url() + '/' + d for d in paths])
          self.call_in_workdir(['svn', 'update'])