Truncate initial bug description if it is too long. Fixes #374

components/bugzilla.py

@@ -194,6 +194,11 @@ def __init__(self, config):
 
     @logEntryExit
     def file_bug(self, library, summary, description, cc_list, needinfo=None, see_also=None, depends_on=None, blocks=None, moco_confidential=False):
+        if len(description) > 65535:
+            self.logger.log("New bug description is too long: %s characters; truncating." % (len(description)), level=LogLevel.Warning)
+            suffix = "\n\nOops - the above comment was too long. I was unable to shrink it nicely, so I had to truncate it to fit Bugzilla's limits."
+            description = description[0:65533 - len(suffix)] + suffix
+
         try:
             bugID = fileBug(self.config['url'], self.config['apikey'], self.config['General']['ff-version'],
                             library.bugzilla_product, library.bugzilla_component,

components/utilities.py

@@ -144,12 +144,15 @@ def decorate(func):
 # Retry calling a function `times` times, sleeping between each tries, with an exponential backoff
 # This is to be used on API calls, that are likely to fail
 
+RETRY_TIMES = 10
 
-def retry(_func=None, *, times=10, sleep_s=1, exp=2):
+
+def retry(_func=None, *, sleep_s=1, exp=2):
     def decorator_retry(func):
         @functools.wraps(func)
         def wrapper_retry(*args, **kwargs):
-            retries_try = times
+            global RETRY_TIMES
+            retries_try = RETRY_TIMES
             sleep_duration = sleep_s
             while retries_try > 0:
                 try:

tests/functionality_all_platforms.py

@@ -16,6 +16,9 @@
 
 sys.path.append(".")
 sys.path.append("..")
+import components.utilities
+components.utilities.RETRY_TIMES = 2
+
 from automation import Updatebot
 
 from components.utilities import Struct, raise_, AssertFalse
@@ -462,7 +465,7 @@ def testTryLockedOutput(self):
 
         def try_output():
             nonlocal call_counter
-            if call_counter < 2:
+            if call_counter < 1:
                 call_counter += 1
                 return (1, TRY_LOCKED_OUTPUT)
             return (0, TRY_OUTPUT(expected_values.try_revision_id()))

tests/functionality_commitalert.py

@@ -12,6 +12,9 @@
 
 sys.path.append(".")
 sys.path.append("..")
+import components.utilities
+components.utilities.RETRY_TIMES = 2
+
 from automation import Updatebot
 
 from components.utilities import Struct, NeverUseMeClass

tests/functionality_two_platforms.py

@@ -16,6 +16,9 @@
 
 sys.path.append(".")
 sys.path.append("..")
+import components.utilities
+components.utilities.RETRY_TIMES = 2
+
 from automation import Updatebot
 
 from components.utilities import Struct, raise_, AssertFalse
@@ -34,6 +37,7 @@
 from tests.mock_treeherder_server import MockTreeherderServerFactory, TYPE_HEALTH
 from tests.database import transform_db_config_to_tmp_db
 
+
 try:
     from localconfig import localconfig
 except ImportError:
@@ -439,7 +443,7 @@ def testTryLockedOutput(self):
 
         def try_output():
             nonlocal call_counter
-            if call_counter < 2:
+            if call_counter < 1:
                 call_counter += 1
                 return (1, TRY_LOCKED_OUTPUT)
             return (0, TRY_OUTPUT(expected_values.try_revisions_func()[0]))