Merge lp:~patrick-crews/drizzle/dbqp_suitelist_fix into lp:drizzle/7.0

[Patrick Crews]

allows a user to pass a comma-separated list of suites via a single --suite argument (ala test-run.pl).

Additional --suite args are appended to previously seen values.

=== modified file 'tests/lib/sys_mgmt/port_management.py'
--- tests/lib/sys_mgmt/port_management.py	2011-01-21 18:47:56 +0000
+++ tests/lib/sys_mgmt/port_management.py	2011-01-27 21:55:56 +0000
@@ -107,7 +107,14 @@
             if entry.startswith('Proto'):
                 good_data = 1
             elif good_data:
-                used_port = int(entry.split()[3].split(':')[-1].strip())
+                # We try to catch additional output
+                # like we see with freebsd
+                if entry.startswith('Active'):
+                    good_data = 0
+                if self.system_manager.cur_os == 'FreeBSD':
+                    used_port = int(entry.split()[3].split('.')[-1].strip())
+                else:
+                    used_port = int(entry.split()[3].split(':')[-1].strip())
                 if port == used_port:
                     if entry.split()[-1] != "TIME_WAIT":
                         return 1
 
=== modified file 'tests/lib/sys_mgmt/system_management.py'
--- tests/lib/sys_mgmt/system_management.py	2011-01-26 01:13:20 +0000
+++ tests/lib/sys_mgmt/system_management.py	2011-01-27 21:55:56 +0000
@@ -49,6 +49,7 @@
         self.env_var_delimiter = ':'
         self.no_shm = variables['noshm']
         self.shm_path = self.find_path(["/dev/shm", "/tmp"], required=0)
+        self.cur_os = os.uname()[0]
         self.symlink_name = 'dtr_work_sym'
         self.workdir = variables['workdir']
         self.start_dirty = variables['startdirty']
 
=== modified file 'tests/lib/test_run_options.py'
--- tests/lib/test_run_options.py	2011-01-25 21:19:06 +0000
+++ tests/lib/test_run_options.py	2011-01-27 21:55:56 +0000
@@ -16,7 +16,12 @@
 # functions
 def comma_list_split(option, opt, value, parser):
     """Callback for splitting input expected in list form"""
-    setattr(parser.values, option.dest, value.split(','))
+    cur_list = getattr(parser.values, option.dest,[])
+    if cur_list:
+        value_list = cur_list + value.split(',')
+    else:
+        value_list = value.split(',')
+    setattr(parser.values, option.dest, value_list)
 
 def organize_options(args, test_cases):
     """Put our arguments in a nice dictionary
@@ -105,7 +110,8 @@
     "--suite"
   , dest="suitelist"
   , type='string'
-  , action="append"
+  , action="callback"
+  , callback=comma_list_split
   , help="The name of the suite containing tests we want. Use one --suite arg for each suite you want to use. [default=autosearch]"
   )