Merge lp:~oem-qa/checkbox-editor/784583 into lp:checkbox-editor

[Sylvain Pineau]

Add .* suffix in whitelist parameter/files for every remote* jobs (LP #784583)

[lp:~oem-qa/checkbox-editor/784583]

134. By Sylvain Pineau on 2011-07-26

Fix whitelist parameter generation

[Javier Collado (javier.collado)]

@Sylvain

Thanks for this merge proposal. I think that the assumption that every remote job will generate children job names that start with the same prefix is a safe one (at least for checkbox-oem).

There is one issue with the code. The text that is displayed in the whitelist view is escaped using re.escape so any string that ends with '.*' is saved as '\.\*' which is not what you're trying to do.

I'll think about a way to fix this while keeping the whitelist view as friendly as possible (probably regular expression patterns shouldn't be displayed there) before you come back from vacation so this is just a reminder for myself.

review: Needs Fixing

[Javier Collado (javier.collado)]

@Sylvain

I've changed the original code as explained in the bzr commit message:
---------------
  Add .* suffix in whitelist parameter/files for every remote* jobs

  It's assumed that all remote jobs will generate job names that start
  with the same name as a prefix (otherwise this change would be
  useless).

  Also, it's assumed that no other job name starts with the same prefix
  (otherwise that job would be unintentionally whitelisted).

  The transformation from selected job name to pattern happens at two
  different places:
  - when the current whitelist is executed
  - when the current whitelist is saved

  Aside from that the transformation from job name to patterns is pretty
  much transparent to the user, that is, the rows being selected are
  exposed, but not the pattern names generated.
---------------

review: Approve

=== modified file 'checkbox_editor/editor.py'
--- checkbox_editor/editor.py	2011-06-22 22:25:55 +0000
+++ checkbox_editor/editor.py	2011-07-26 14:32:45 +0000
@@ -878,7 +878,10 @@
             for row in model.get_selected_rows(include_resources=whitelist_resources):
                 description = row[model.DESCRIPTION]
                 if description and 'name' in description:
-                    yield description['name']
+                    if 'plugin' in description and 'remote' in description['plugin']:
+                        yield description['name']+'.*'
+                    else:
+                        yield description['name']
 
         command = '{0} -w "{1}"'.format(self.preferences.general['checkbox_binary'],
                                         ' '.join(selected_row_names()))

=== modified file 'checkbox_editor/model.py'
--- checkbox_editor/model.py	2011-07-22 21:53:39 +0000
+++ checkbox_editor/model.py	2011-07-26 14:32:45 +0000
@@ -1340,7 +1340,11 @@
         description = row[self.DESCRIPTION]
         if description:
             name = description.get('name')
+            plugin = description.get('plugin')
             if name:
+                if plugin:
+                    if 'remote' in plugin:
+                        name = name+'.*'
                 if value:
                     self.whitelist.append(name)
                 else:

=== modified file 'checkbox_editor/whitelist.py'
--- checkbox_editor/whitelist.py	2011-06-23 12:10:24 +0000
+++ checkbox_editor/whitelist.py	2011-07-26 14:32:45 +0000
@@ -334,10 +334,15 @@
                 description = row[self.main_model.DESCRIPTION]
                 if (description and 'name' in description
                     and pattern.match(description['name'])):
+                    name = description['name']
+                    plugin = description['plugin']
+                    if plugin:
+                        if 'remote' in plugin:
+                            name = name+'.*'
                     logging.debug('{0} selected because of pattern {1}'
-                                  .format(repr(description['name']),
+                                  .format(repr(name),
                                           repr(pattern.pattern)))
-                    self.append(description['name'])
+                    self.append(name)
                     row[self.main_model.SELECTED] = True
                     pattern_matched = True