Merge remote branch 'cros/upstream' into master

client/common_lib/control_data.py

 #
 # Copyright 2008 Google Inc. Released under the GPL v2
 
 import compiler, textwrap, types
 
 
 REQUIRED_VARS = set(['author', 'doc', 'name', 'time', 'test_class',
                      'test_category', 'test_type'])
 
 class ControlVariableException(Exception):
     pass
 
 
 class ControlData(object):
     def __init__(self, vars, path, raise_warnings=False):
         # Defaults
         self.path = path
         self.dependencies = set()
         self.experimental = False
         self.run_verify = True
         self.sync_count = 1
+        self.test_parameters = set()
 
         diff = REQUIRED_VARS - set(vars)
         if len(diff) > 0:
             warning = ("WARNING: Not all required control "
                        "variables were specified in %s.  Please define "
                        "%s.") % (self.path, ', '.join(diff))
             if raise_warnings:
                 raise ControlVariableException(warning)
             print textwrap.wrap(warning, 80)
 
@@ skipping 95 matching lines @@
         self._set_string('test_class', val.lower())
 
 
     def set_test_category(self, val):
         self._set_string('test_category', val.lower())
 
 
     def set_test_type(self, val):
         self._set_option('test_type', val, ['client', 'server'])
 
+
     def set_test_parameters(self, val):
         self._set_set('test_parameters', val)
 
 
 def _extract_const(n):
     assert(n.__class__ == compiler.ast.Assign)
     assert(n.expr.__class__ == compiler.ast.Const)
     assert(n.expr.value.__class__ in (str, int, float, unicode))
     assert(n.nodes.__class__ == list)
     assert(len(n.nodes) == 1)
@@ skipping 38 matching lines @@
     for n in mod.node.nodes:
         for fn in (_extract_const, _extract_name):
             try:
                 key, val = fn(n)
 
                 vars[key] = val
             except AssertionError, e:
                 pass
 
     return ControlData(vars, path, raise_warnings)