commit

server/site_tests/suite_Nightly/control.browsertest

Index: server/site_tests/suite_Nightly/control.browsertest
diff --git a/server/site_tests/suite_Nightly/control.browsertest b/server/site_tests/suite_Nightly/control.browsertest
index 76ea2295e9486b429315bd8b5820dda5e24172de..abdb5b6cd701c0f651cee46d684f7a678f6262d9 100644
--- a/server/site_tests/suite_Nightly/control.browsertest
+++ b/server/site_tests/suite_Nightly/control.browsertest
@@ -15,9 +15,28 @@ with the BuildVerify suite, verify that all major features in the build are
 fully functional.  These are meant to run nightly in less than 8 hours.
 """
 
-def run(machine):
+# List of client tests with parameters
+TESTS = [
+  ('desktopui_BrowserTest', {}),
+  ('desktopui_SyncIntegrationTests', {}),
+]
+
+# A dict which holds {machine: [(test, argv), (test, argv), ...]}
+test_dict = {}
+
+# Assign tests with its argv to machines in a round-robin way.
+index = 0
+for test_with_argv in TESTS:
+  m_index = index % len(machines)
+  test_list = test_dict.setdefault(machines[m_index], [])
+  test_list.append(test_with_argv)
+  index += 1
+
+def run_assigned_tests(machine):
   client = hosts.create_host(machine)
   client_at = autotest.Autotest(client)
-  client_at.run_test('desktopui_BrowserTest')
+  test_list = test_dict[machine]
+  for test, argv in test_list:
+    client_at.run_test(test, **argv)
 
-job.parallel_on_machines(run, machines)
+job.parallel_on_machines(run_assigned_tests, machines)