1
=== modified file 'lib/lp/bugs/scripts/checkwatches.py'
2
--- lib/lp/bugs/scripts/checkwatches.py	2009-11-28 08:31:15 +0000
3
+++ lib/lp/bugs/scripts/checkwatches.py	2009-12-15 16:31:16 +0000
4
@@ -462,7 +462,7 @@
5
462
            remotesystem_for_others.sync_comments = False
462
            remotesystem_for_others.sync_comments = False
6
463
463
7
464
            for bug_watch in bug_watches:
464
            for bug_watch in bug_watches:
9
465
                if (remote_products[bug_watch.remotebug] in
465
                if (remote_products.get(bug_watch.remotebug, None) in
10
466
                    self._syncable_gnome_products):
466
                    self._syncable_gnome_products):
11
467
                    syncable_watches.append(bug_watch)
467
                    syncable_watches.append(bug_watch)
12
468
                else:
468
                else:
13
469
469
14
=== added file 'lib/lp/bugs/scripts/tests/test_checkwatches.py'
15
--- lib/lp/bugs/scripts/tests/test_checkwatches.py	1970-01-01 00:00:00 +0000
16
+++ lib/lp/bugs/scripts/tests/test_checkwatches.py	2009-12-15 16:31:16 +0000
17
@@ -0,0 +1,99 @@
18
1
# Copyright 2009 Canonical Ltd.  This software is licensed under the
19
2
# GNU Affero General Public License version 3 (see the file LICENSE).
20
3
"""Checkwatches unit tests."""
21
4
22
5
__metaclass__ = type
23
6
24
7
import unittest
25
8
import transaction
26
9
27
10
from zope.component import getUtility
28
11
29
12
from canonical.launchpad.scripts.logger import QuietFakeLogger
30
13
from canonical.launchpad.interfaces import ILaunchpadCelebrities
31
14
from canonical.testing import LaunchpadZopelessLayer
32
15
33
16
from lp.bugs.externalbugtracker.bugzilla import BugzillaAPI
34
17
from lp.bugs.scripts import checkwatches
35
18
from lp.testing import TestCaseWithFactory
36
19
37
20
38
21
def fudged_get_external_bugtracker(bugtracker):
39
22
    """A version of get_external_bugtracker that returns BugzillaAPI."""
40
23
    return BugzillaAPI(bugtracker.baseurl)
41
24
42
25
43
26
class NonConnectingBugzillaAPI(BugzillaAPI):
44
27
    """A non-connected version of the BugzillaAPI ExternalBugTracker."""
45
28
46
29
    bugs = {
47
30
        1: {'product': 'test-product'},
48
31
        }
49
32
50
33
    def getExternalBugTrackerToUse(self):
51
34
        return self
52
35
53
36
    def getProductsForRemoteBugs(self, remote_bugs):
54
37
        """Return the products for some remote bugs.
55
38
56
39
        This method is basically the same as that of the superclass but
57
40
        without the call to initializeRemoteBugDB().
58
41
        """
59
42
        bug_products = {}
60
43
        for bug_id in bug_ids:
61
44
            # If one of the bugs we're trying to get the product for
62
45
            # doesn't exist, just skip it.
63
46
            try:
64
47
                actual_bug_id = self._getActualBugId(bug_id)
65
48
            except BugNotFound:
66
49
                continue
67
50
68
51
            bug_dict = self._bugs[actual_bug_id]
69
52
            bug_products[bug_id] = bug_dict['product']
70
53
71
54
        return bug_products
72
55
73
56
74
57
class TestCheckwatchesWithSyncableGnomeProducts(TestCaseWithFactory):
75
58
76
59
    layer = LaunchpadZopelessLayer
77
60
78
61
    def setUp(self):
79
62
        super(TestCheckwatchesWithSyncableGnomeProducts, self).setUp()
80
63
81
64
        # We monkey-patch externalbugtracker.get_external_bugtracker()
82
65
        # so that it always returns what we want.
83
66
        self.original_get_external_bug_tracker = (
84
67
            checkwatches.externalbugtracker.get_external_bugtracker)
85
68
        checkwatches.externalbugtracker.get_external_bugtracker = (
86
69
            fudged_get_external_bugtracker)
87
70
88
71
        # Create an updater with a limited set of syncable gnome
89
72
        # products.
90
73
        self.updater = checkwatches.BugWatchUpdater(
91
74
            transaction, QuietFakeLogger(), ['test-product'])
92
75
93
76
    def tearDown(self):
94
77
        checkwatches.externalbugtracker.get_external_bugtracker = (
95
78
            self.original_get_external_bug_tracker)
96
79
        super(TestCheckwatchesWithSyncableGnomeProducts, self).tearDown()
97
80
98
81
    def test_bug_496988(self):
99
82
        # Regression test for bug 496988. KeyErrors when looking for the
100
83
        # remote product for a given bug shouldn't travel upwards and
101
84
        # cause the script to abort.
102
85
        gnome_bugzilla = getUtility(ILaunchpadCelebrities).gnome_bugzilla
103
86
        bug_watch_1 = self.factory.makeBugWatch(
104
87
            remote_bug=1, bugtracker=gnome_bugzilla)
105
88
        bug_watch_2 = self.factory.makeBugWatch(
106
89
            remote_bug=2, bugtracker=gnome_bugzilla)
107
90
108
91
        # Calling this method shouldn't raise a KeyError, even though
109
92
        # there's no bug 2 on the bug tracker that we pass to it.
110
93
        self.updater._getExternalBugTrackersAndWatches(
111
94
            gnome_bugzilla, [bug_watch_1, bug_watch_2])
112
95
113
96
114
97
def test_suite():
115
98
    return unittest.TestLoader().loadTestsFromName(__name__)
116
99
Reviewer	Review Type	Date Requested	Status
Данило Шеган (community)	release-critical	2009-12-15	Approve on 2009-12-15
Brad Crittenden (community)	code	2009-12-15	Approve on 2009-12-15
Review via email: mp+16204@code.launchpad.net