Bug 821624, support for specifying promptWaitTime for updates, r=bhea…

…rsum

lib/python/release/updates/patcher.py

@@ -3,7 +3,9 @@
 from apache_conf_parser import ApacheConfParser
 
 from release.platforms import ftp2bouncer
-from release.updates.snippets import SCHEMA_2_OPTIONAL_ATTRIBUTES
+from release.updates.snippets import (SCHEMA_2_OPTIONAL_ATTRIBUTES,
+    SCHEMA_2_OPTIONAL_ATTRIBUTES_SINGLE_VALUE,
+    SCHEMA_2_OPTIONAL_ATTRIBUTES_MULTI_VALUE)
 
 log = logging.getLogger()
 
@@ -222,10 +224,12 @@ def parseCurrentUpdate(self, currentUpdate):
                 raise PatcherConfigError("Found multiple entries for '%s' in current-update section" % node.name)
 
             # These are all single-value nodes.
-            if node.name in ('details', 'from', 'to', 'beta-dir'):
+            if node.name in ('details', 'from', 'to', 'beta-dir') + \
+               SCHEMA_2_OPTIONAL_ATTRIBUTES_SINGLE_VALUE:
                 cu[node.name] = self._stripStringNode(node.content)
             # These are potentially multiple value nodes.
-            elif node.name in ('channel', 'testchannel', 'actions'):
+            elif node.name in ('channel', 'testchannel') + \
+                 SCHEMA_2_OPTIONAL_ATTRIBUTES_MULTI_VALUE:
                 cu[node.name] = list(node.arguments)
             # Force is weird in that it's a multiple value node, but the
             # patcher config bumping script lists it multiple times rather

lib/python/release/updates/snippets.py

@@ -2,10 +2,13 @@
 
 from release.platforms import ftp2updatePlatforms, ftp_update_platform_map
 
-SCHEMA_2_OPTIONAL_ATTRIBUTES = (
-    'showPrompt', 'showNeverForVersion', 'showSurvey', 'actions', 'licenseUrl',
-    'billboardURL', 'openURL', 'notificationURL', 'alertURL',
+SCHEMA_2_OPTIONAL_ATTRIBUTES_SINGLE_VALUE = (
+    'showPrompt', 'showNeverForVersion', 'showSurvey', 'licenseUrl',
+    'billboardURL', 'openURL', 'notificationURL', 'alertURL', 'promptWaitTime',
 )
+SCHEMA_2_OPTIONAL_ATTRIBUTES_MULTI_VALUE = ('actions',)
+SCHEMA_2_OPTIONAL_ATTRIBUTES = SCHEMA_2_OPTIONAL_ATTRIBUTES_SINGLE_VALUE + \
+                               SCHEMA_2_OPTIONAL_ATTRIBUTES_MULTI_VALUE
 
 schema1_snippet_template = """\
 version=%(schema)s