Merge lp:~dobey/ubuntuone-dev-tools/twisted-ankle into lp:ubuntuone-dev-tools

[dobey]

Don't set the tests container variable as a set or list, for now.
Use the appropriate set updating or list extending method for compat.

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'ubuntuone/devtools/runners/__init__.py'
--- ubuntuone/devtools/runners/__init__.py	2012-11-28 21:45:47 +0000
+++ ubuntuone/devtools/runners/__init__.py	2013-07-08 18:55:45 +0000
@@ -203,7 +203,6 @@
 
     def __init__(self, *args, **kwargs):
         super(BaseTestOptions, self).__init__(*args, **kwargs)
-        self['tests'] = set()
 
     def opt_help_runners(self):
         """List the runners which are supported."""
@@ -239,11 +238,12 @@
         self['test'] = option
 
     # We use some camelcase names for trial compatibility here.
-    # pylint: disable=C0103
     def parseArgs(self, *args):
         """Handle the extra arguments."""
-        self['tests'].update(args)
-    # pylint: enable=C0103
+        if isinstance(self.tests, set):
+            self['tests'].update(args)
+        elif isinstance(self.tests, list):
+            self['tests'].extend(args)
 
 
 def _get_runner_options(runner_name):