Merge remote branch 'origin/upstream' into tempbranch

utils/unittest_suite.py

 #!/usr/bin/python -u
 
 import os, sys, unittest, optparse
 import common
 from autotest_lib.utils import parallel
 from autotest_lib.client.common_lib.test_utils import unittest as custom_unittest
 
 parser = optparse.OptionParser()
 parser.add_option("-r", action="store", type="string", dest="start",
                   default='',
@@ skipping 27 matching lines @@
 
 REQUIRES_GWT = set((
         'client_compilation_unittest.py',
         ))
 
 REQUIRES_SIMPLEJSON = set((
         'resources_test.py',
         'serviceHandler_unittest.py',
         ))
 
+REQUIRES_AUTH = set ((
+    'trigger_unittest.py',
+    ))
+
 LONG_RUNTIME = set((
     'barrier_unittest.py',
     'logging_manager_test.py',
     ))
 
 LONG_TESTS = (REQUIRES_DJANGO |
               REQUIRES_MYSQLDB |
               REQUIRES_GWT |
               REQUIRES_SIMPLEJSON |
+              REQUIRES_AUTH |
               LONG_RUNTIME)
 
 
 ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
 
 
 class TestFailure(Exception): pass
 
 
 def run_test(mod_names, options):
@@ skipping 102 matching lines @@
             print "\t%s" % error
         print "Rerun", sys.argv[0], "--debug to see the failure details."
         sys.exit(1)
     else:
         print "All passed!"
         sys.exit(0)
 
 
 if __name__ == "__main__":
     main()