Merge remote branch 'cros/upstream' into master.

cli/job_unittest.py

 #!/usr/bin/python -u
 #
 # Copyright 2008 Google Inc. All Rights Reserved.
 
 
 """Tests for job."""
 
 import copy, getpass, unittest, sys, os
 
 import common
@@ skipping 813 matching lines @@
         file_temp = cli_mock.create_file(self.ctrl_file)
         self.run_cmd(argv=['atest', 'job', 'create', '-f', file_temp.name,
                            'test_job0', '-m', 'host0', '-d', 'dep1, dep2 ',
                            '--ignore_site_file'],
                      rpcs=[('create_job', data, True, 42)],
                      out_words_ok=['test_job0', 'Created'],
                      out_words_no=['Uploading', 'Done'])
         file_temp.clean()
 
 
+    def test_execute_create_job_with_control_and_comma_dependencies(self):
+        data = self.data.copy()
+        data['dependencies'] = ['dep2,False', 'dep1,True']
+        file_temp = cli_mock.create_file(self.ctrl_file)
+        self.run_cmd(argv=['atest', 'job', 'create', '-f', file_temp.name,
+                           'test_job0', '-m', 'host0', '-d',
+                           'dep1\,True, dep2\,False ', '--ignore_site_file'],
+                     rpcs=[('create_job', data, True, 42)],
+                     out_words_ok=['test_job0', 'Created'],
+                     out_words_no=['Uploading', 'Done'])
+        file_temp.clean()
+
+
     def test_execute_create_job_with_synch_count(self):
         data = self.data.copy()
         data['synch_count'] = 2
         file_temp = cli_mock.create_file(self.ctrl_file)
         self.run_cmd(argv=['atest', 'job', 'create', '-f', file_temp.name,
                            'test_job0', '-m', 'host0', '-y', '2',
                            '--ignore_site_file'],
                      rpcs=[('create_job', data, True, 42)],
                      out_words_ok=['test_job0', 'Created'],
                      out_words_no=['Uploading', 'Done'])
@@ skipping 11 matching lines @@
                             True,
                             {'control_file' : self.ctrl_file,
                              'synch_count' : 1,
                              'is_server' : False,
                              'dependencies' : ['dep3']}),
                            ('create_job', data, True, 42)],
                      out_words_ok=['test_job0', 'Created'],
                      out_words_no=['Uploading', 'Done'])
 
 
+    def test_execute_create_job_with_test_and_comma_dependencies(self):
+        data = self.data.copy()
+        data['dependencies'] = ['dep1,True', 'dep2,False', 'dep3,123']
+        self.run_cmd(argv=['atest', 'job', 'create', '-t', 'sleeptest',
+                           'test_job0', '-m', 'host0', '-d',
+                           'dep1\,True dep2\,False ', '--ignore_site_file'],
+                     rpcs=[('generate_control_file',
+                            {'tests': ['sleeptest']},
+                            True,
+                            {'control_file' : self.ctrl_file,
+                             'synch_count' : 1,
+                             'is_server' : False,
+                             'dependencies' : ['dep3,123']}),
+                           ('create_job', data, True, 42)],
+                     out_words_ok=['test_job0', 'Created'],
+                     out_words_no=['Uploading', 'Done'])
+
+
     def test_execute_create_job_with_kernel(self):
         data = self.data.copy()
         data['control_file'] = self.kernel_ctrl_file
         self.run_cmd(argv=['atest', 'job', 'create', '-t', 'sleeptest',
                            '-k', 'kernel', 'test_job0', '-m', 'host0',
                            '--ignore_site_file'],
                      rpcs=[('generate_control_file',
                             {'tests': ['sleeptest'],
                              'kernel': [{'version': 'kernel'}],
                              'do_push_packages': True},
@@ skipping 562 matching lines @@
     def test_execute_job_abort(self):
         self.run_cmd(argv=['atest', 'job', 'abort', '180',
                            '--ignore_site_file'],
                      rpcs=[('abort_host_queue_entries',
                             {'job__id__in': ['180']}, True, None)],
                      out_words_ok=['Aborting', '180'])
 
 
 if __name__ == '__main__':
     unittest.main()