Merge remote branch 'cros/upstream' into master.

cli/job.py

 #
 # Copyright 2008 Google Inc. All Rights Reserved.
 
 """
 The job module contains the objects and methods used to
 manage jobs in Autotest.
 
 The valid actions are:
 list:    lists job(s)
 create:  create a job
@@ skipping 281 matching lines @@
                     meta_hosts += int(num) * [host]
                 elif re.match('^[*](\w*)', host):
                     meta_hosts += [re.match('^[*](\w*)', host).group(1)]
                 elif host != '' and host not in hosts:
                     # Real hostname and not a duplicate
                     hosts.append(host)
 
         return (hosts, meta_hosts)
 
 
-    def parse(self):
+    def parse(self, parse_info=[]):
         host_info = topic_common.item_parse_info(attribute_name='hosts',
                                                  inline_option='machine',
                                                  filename_option='mlist')
         job_info = topic_common.item_parse_info(attribute_name='jobname',
                                                 use_leftover=True)
         oth_info = topic_common.item_parse_info(attribute_name='one_time_hosts',
                                                 inline_option='one_time_hosts')
         label_info = topic_common.item_parse_info(attribute_name='labels',
                                                   inline_option='labels')
 
-        options, leftover = super(job_create_or_clone,
-                                  self).parse([host_info, job_info, oth_info,
-                                               label_info], req_items='jobname')
+        options, leftover = super(job_create_or_clone, self).parse(
+                [host_info, job_info, oth_info, label_info] + parse_info,
+                req_items='jobname')
         self.data = {}
         if len(self.jobname) > 1:
             self.invalid_syntax('Too many arguments specified, only expected '
                                 'to receive job name: %s' % self.jobname)
         self.jobname = self.jobname[0]
 
         if options.priority:
             self.data['priority'] = options.priority.capitalize()
 
         if self.one_time_hosts:
@@ skipping 112 matching lines @@
                 continue
             kernel_info = {'version': version}
             if cmdline:
                 kernel_info['cmdline'] = cmdline
             kernels.append(kernel_info)
 
         return kernels
 
 
     def parse(self):
-        options, leftover = super(job_create, self).parse()
+        deps_info = topic_common.item_parse_info(attribute_name='dependencies',
+                                                 inline_option='dependencies')
+        options, leftover = super(job_create, self).parse(
+                parse_info=[deps_info])
 
         if (len(self.hosts) == 0 and not self.one_time_hosts
             and not options.labels and not options.atomic_group):
             self.invalid_syntax('Must specify at least one machine '
                                 'or an atomic group '
                                 '(-m, -M, -b, -G or --one-time-hosts).')
         if not options.control_file and not options.test:
             self.invalid_syntax('Must specify either --test or --control-file'
                                 ' to create a job.')
         if options.control_file and options.test:
@@ skipping 40 matching lines @@
         if options.noverify:
             self.data['run_verify'] = False
         if options.timeout:
             self.data['timeout'] = options.timeout
         if options.max_runtime:
             self.data['max_runtime_hrs'] = options.max_runtime
 
         if options.atomic_group:
             self.data['atomic_group_name'] = options.atomic_group
 
-        deps = options.dependencies.split(',')
-        deps = [dep.strip() for dep in deps if dep.strip()]
-        self.data['dependencies'] = deps
+        self.data['dependencies'] = self.dependencies
 
         if options.synch_count:
             self.data['synch_count'] = options.synch_count
         if options.server:
             self.data['control_type'] = 'Server'
         else:
             self.data['control_type'] = 'Client'
 
         return options, leftover
 
@@ skipping 121 matching lines @@
 
 
     def execute(self):
         data = {'job__id__in': self.jobids}
         self.execute_rpc(op='abort_host_queue_entries', **data)
         print 'Aborting jobs: %s' % ', '.join(self.jobids)
 
 
     def get_items(self):
         return self.jobids