Merge lp:~allenap/launchpad/launchpad-naughty-naughty-comment-sync-bug-499113 into lp:launchpad

[Gavin Panella]

Don't sync bug comments with remote bug trackers unless there are one or more bug tasks related to the watch.

[Gavin Panella (allenap)]

Checks that a bug watch is related to at least one bug task before syncing comments or back-linking.

[Abel Deuring (adeuring)]

review: Approve (code)

=== modified file 'lib/lp/bugs/doc/checkwatches.txt'
--- lib/lp/bugs/doc/checkwatches.txt	2009-11-23 16:17:59 +0000
+++ lib/lp/bugs/doc/checkwatches.txt	2010-02-12 15:59:16 +0000
@@ -439,12 +439,14 @@
     ...     def setLaunchpadBugId(self, bug_id, lp_bug_id):
     ...         print "setLaunchpadBugId() called"
 
-We'll generate a bug watch with which to test this.
+We'll generate a bug watch with which to test this. The bug watch must
+be associated with at least one bug task to enable syncing.
 
     >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
     >>> login('[e-mail]')
     >>> bug_tracker = factory.makeBugTracker()
     >>> bug_watch = factory.makeBugWatch(bugtracker=bug_tracker)
+    >>> bug_watch.bug.default_bugtask.bugwatch = bug_watch
     >>> transaction.commit()
     >>> LaunchpadZopelessLayer.switchDbUser(config.checkwatches.dbuser)
 

=== modified file 'lib/lp/bugs/doc/externalbugtracker-linking-back.txt'
--- lib/lp/bugs/doc/externalbugtracker-linking-back.txt	2009-06-15 11:10:49 +0000
+++ lib/lp/bugs/doc/externalbugtracker-linking-back.txt	2010-02-12 15:59:16 +0000
@@ -34,7 +34,12 @@
     >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
 
     >>> bug_watch = factory.makeBugWatch('42')
+    >>> bug_watch.bug.default_bugtask.bugwatch = bug_watch
     >>> bug_watch_2 = factory.makeBugWatch('42', bug_watch.bugtracker)
+    >>> bug_watch_2.bug.default_bugtask.bugwatch = bug_watch_2
+    >>> bug_watch_without_bugtask = (
+    ...     factory.makeBugWatch('42', bug_watch.bugtracker))
+
     >>> unlinked_bug = factory.makeBug()
 
     >>> txn.commit()
@@ -52,6 +57,12 @@
     >>> external_bugtracker.last_launchpad_bug_id == bug_watch.bug.id
     True
 
+For comment syncing and back-linking to be attempted, bug watches must
+be related to a bug task, not just a bug.
+
+    >>> bug_watch_updater.updateBugWatches(
+    ...     external_bugtracker, [bug_watch_without_bugtask])
+
 
 == BugWatchUpdater.linkLaunchpadBug() ==
 

=== modified file 'lib/lp/bugs/scripts/checkwatches.py'
--- lib/lp/bugs/scripts/checkwatches.py	2010-01-20 15:58:04 +0000
+++ lib/lp/bugs/scripts/checkwatches.py	2010-02-12 15:59:16 +0000
@@ -867,10 +867,12 @@
                     if new_malone_importance is not None:
                         bug_watch.updateImportance(new_remote_importance,
                             new_malone_importance)
-                    if bug_watch.bug.duplicateof is None:
+                    if (bug_watch.bug.duplicateof is None and
+                        len(bug_watch.bugtasks) > 0):
                         # Only sync comments and backlink if the local
-                        # bug isn't a duplicate. This helps us to avoid
-                        # spamming upstream.
+                        # bug isn't a duplicate, *and* if the bug
+                        # watch is associated with a bug task. This
+                        # helps us to avoid spamming upstream.
                         if can_import_comments:
                             self.importBugComments(remotesystem, bug_watch)
                         if can_push_comments:

=== modified file 'lib/lp/bugs/scripts/tests/test_bugimport.py'
--- lib/lp/bugs/scripts/tests/test_bugimport.py	2010-01-04 16:08:32 +0000
+++ lib/lp/bugs/scripts/tests/test_bugimport.py	2010-02-12 15:59:16 +0000
@@ -770,6 +770,7 @@
         self.id = id
         self.remotebug = str(self.id)
         self.bug = bug
+        self.bugtasks = [self.bug.default_bugtask]
         self.failing = failing
         self.url = 'http://bugs.example.com/issues/%d' % id