Merge remote branch 'cros/upstream' into master
Merged to upstream autotest @4749~@5215.
The entire change list description is too big to enlist here. Please refer to upstream (http://autotest.kernel.org/browser) for more details.
BUG=
TEST=emerged both x86 and arm build.
Tested emerged x86 build bvt against a chromeos device.
Review URL: http://codereview.chromium.org/6246035
Change-Id: I8455f2135c87c321c6efc232e2869dc8f675395e
diff --git a/cli/job.py b/cli/job.py
index 660dfe5..c909591 100644
--- a/cli/job.py
+++ b/cli/job.py
@@ -609,6 +609,12 @@
for field in ('name', 'created_on', 'id', 'owner'):
del clone_info['job'][field]
+ # Also remove parameterized_job field, as the feature still is
+ # incomplete, this tool does not attempt to support it for now,
+ # it uses a different API function and it breaks create_job()
+ if clone_info['job'].has_key('parameterized_job'):
+ del clone_info['job']['parameterized_job']
+
# Keyword args cannot be unicode strings
self.data.update((str(key), val)
for key, val in clone_info['job'].iteritems())