Merge lp:~mabac/svammel/bug-749563-set-severity into lp:svammel

[Mattias Backman]

Hi,

This branch adds the feature to set Importance for all newly created bugs.

As a side effect it also adds the --ignore-errors parameter which might be used when targeting series etc in the future.

If --ignore-errors is specified only non-critical errors may be ignored, like setting importance fails. Certain errors like an archive being offline will of course still have to make the script bail.

Thanks,

Mattias

[James Westby (james-w)]

Hi,

I don't really like globals, as they can cause many problems later, but
they are easy to do here, and given the purpose of this script it likely
won't cause many issues.

Thanks,

James

review: Approve

=== modified file 'bug_reporting.py'
--- bug_reporting.py	2011-03-22 10:17:01 +0000
+++ bug_reporting.py	2011-04-05 14:43:58 +0000
@@ -10,6 +10,7 @@
 ###############################################################################
 from config import (
     print_message,
+    continue_on_error,
     )
 
 
@@ -20,16 +21,7 @@
     return project.self_link
 
 
-def file_bug(package_name, description, title, tags, lp):
-    """ File a bug on the package specified by name.
-
-    Returns the newly created bug or None if no bug was filed.
-    """
-    project_url = get_project_url(package_name, lp)
-    return file_bug_by_url(project_url, description, title, tags, lp)
-
-
-def file_bug_by_url(target_url, description, title, tags, lp):
+def file_bug_by_url(target_url, description, title, tags, lp, importance=None):
     """ File a bug on the bug target specified by target_url.
 
     Returns the newly created bug or None if no bug was filed.
@@ -40,12 +32,25 @@
                             tags=tags)
     if bug is not None:
         print 'Filed bug %i: %s' % (bug.id, bug.web_link)
+        if importance is not None:
+            set_bugtask_importance(bug, importance)
     else:
         print "Error: unable to file bug '%s'." % title
 
     return bug
 
 
+def set_bugtask_importance(bug, importance):
+    try:
+        for bug_task in bug.bug_tasks:
+            bug_task.importance = importance
+            bug_task.lp_save()
+    except:
+        if continue_on_error():
+            print "Error: unable to set bug importance to '%s' but will proceed." % importance
+        else:
+            raise
+
 def bug_already_filed(package_name, lp):
     """ Check to see if this project already has an active bug."""
     project_url = get_project_url(package_name, lp)

=== modified file 'config.py'
--- config.py	2011-03-22 10:17:01 +0000
+++ config.py	2011-04-05 14:43:58 +0000
@@ -34,6 +34,7 @@
 base_api_url = ''
 lp = None
 verbose = False
+ignore_errors = False
 
 
 def verify_inited():
@@ -46,6 +47,15 @@
     verbose = state
 
 
+def set_ignore_errors(state):
+    global ignore_errors
+    ignore_errors = state
+
+
+def continue_on_error():
+    return ignore_errors
+
+
 def get_service_root():
     verify_inited()
     return service_root
@@ -120,6 +130,15 @@
     parser.add_argument(
         '--logfile', required=False,
         help="Path to file where reported bugs are logged.")
+    parser.add_argument(
+        '--importance',
+        choices=['Unknown', 'Critical', 'High', 'Medium', 'Low',
+                 'Wishlist', 'Undecided'],
+        help='If specified, sets the Importance of all created bugs.')
+    parser.add_argument(
+        '--ignore-errors', action='store_true', dest='ignoreerrors',
+        help='Ignore errors that do not prevent proper completion, such as ' \
+            'failure to set bug attributes.')
 
     return parser
 

=== modified file 'file-failures.py'
--- file-failures.py	2011-03-23 08:25:30 +0000
+++ file-failures.py	2011-04-05 14:43:58 +0000
@@ -25,6 +25,7 @@
     get_args_parser,
     print_message,
     set_verbose_messages,
+    set_ignore_errors,
 )
 from build_log import (
     get_file_contents,
@@ -47,6 +48,7 @@
 parser = get_args_parser()
 args = parser.parse_args()
 set_verbose_messages(args.verbose)
+set_ignore_errors(args.ignoreerrors)
 
 init(args.serviceroot, 'testing', '~/.launchpadlib/cache/')
 
@@ -102,7 +104,7 @@
         "Will file bug for %s\n desc: %s\n title:  %s\n tags: %s" %
         (spph.package_name, bug_description[0:220], bug_title, bug_tags))
     bug = file_bug_by_url(spph.url, bug_description, bug_title,
-                          bug_tags, get_launchpad())
+                          bug_tags, get_launchpad(), args.importance)
     if bug is not None and args.logfile is not None:
         bug_log.write_entry(
             LogEntry(spph.package_name, spph.version, fail_platform,

=== modified file 'tests/test_fail_filer.py'
--- tests/test_fail_filer.py	2011-03-01 11:50:47 +0000
+++ tests/test_fail_filer.py	2011-04-05 14:43:58 +0000
@@ -22,6 +22,7 @@
     )
 from bug_reporting import (
     bug_already_filed_by_url,
+    set_bugtask_importance,
 #    get_project_url,
 #    file_bug,
     )
@@ -35,6 +36,7 @@
     inited,
     ConfigInitError,
     LaunchpadError,
+    set_ignore_errors,
     )
 
 
@@ -79,6 +81,23 @@
 
 class TestFileBug(TestCaseWithFixtures):
 
+    class MockBug:
+        def __init__(self):
+            self.bug_tasks = []
+        def add_bug_task(self, bug_task):
+            self.bug_tasks.append(bug_task)
+
+    class MockBugTask:
+        def __init__(self, will_fail_on_save):
+            self.will_fail_on_save = will_fail_on_save
+            self.importance = 'Undecided'
+            self.has_saved = False
+        def lp_save(self):
+            if self.will_fail_on_save:
+                raise Exception()
+            else:
+                self.has_saved = True
+
     def setUp(self):
         super(TestFileBug, self).setUp()
 
@@ -106,6 +125,26 @@
         self.assertFalse(bug_already_filed_by_url('https://dummy',
                                             MockLaunchpad()))
 
+    def test_set_importance_saves(self):
+        bug = self.MockBug()
+        bug_task = self.MockBugTask(False)
+        bug.add_bug_task(bug_task)
+        set_bugtask_importance(bug, 'High')
+        self.assertEquals(True, bug_task.has_saved)
+
+    def test_set_importance_can_ignore_errors(self):
+        set_ignore_errors(True)
+        bug = self.MockBug()
+        bug.add_bug_task(self.MockBugTask(True))
+        set_bugtask_importance(bug, 'High')
+
+    def test_set_importance_raises(self):
+        set_ignore_errors(False)
+        bug = self.MockBug()
+        bug.add_bug_task(self.MockBugTask(True))
+        self.assertRaises(Exception, set_bugtask_importance, bug, 'High')
+                         
+                         
 #    def test_file_bug(self):
 #        bug = file_bug(self.project_name, self.description, self.title,
 #                       self.tags, self.lp)