Merge remote branch 'cros/upstream' into master

utils/test_importer.py

 #!/usr/bin/python
 #
 # Copyright 2008 Google Inc. All Rights Reserved.
 """
 This utility allows for easy updating, removing and importing
 of tests into the autotest_web afe_autotests table.
 
 Example of updating client side tests:
 ./test_importer.py -t /usr/local/autotest/client/tests
 
@@ skipping 224 matching lines @@
                                  test_new_test[-1])
                 new_test.name = control_name.replace('control.', '')
 
         # Experimental Check
         if not add_experimental and new_test.experimental:
             continue
 
         _log_or_execute(repr(new_test), new_test.save)
         add_label_dependencies(new_test)
 
+        # save TestParameter
+        for para_name in data.test_parameters:
+            test_parameter = models.TestParameter.objects.get_or_create(
+                test=new_test, name=para_name)[0]
+            test_parameter.save()
+
 
 def _set_attributes_clean(test, data):
     """
     First pass sets the attributes of the Test object from file system.
 
     @param test: a test object to be populated for the database.
     @param data: object with test data from the file system.
     """
     test_type = { 'client' : 1,
                   'server' : 2, }
@@ skipping 317 matching lines @@
         profilers = get_tests_from_fs(options.profile_dir, '.*py$')
         update_profilers_in_db(profilers,
                                add_noncompliant=options.add_noncompliant,
                                description='NA')
     if options.clean_tests:
         db_clean_broken(options.autotest_dir)
 
 
 if __name__ == "__main__":
     main(sys.argv)