Since its introduction on r2440, server/frontend.py has a call to
generate_control_file, present on frontend/afe/rpc_interface.py.
This method apparently never had a do_push_packages parameter,
but for some reason we were passing it in case we provide a specific
kernel with -k. Remove all references to do_push_packages.
With this, bug #47 is fixed, and it is possible to specify -k through
the cli.
Signed-off-by: Lucas Meneghel Rodrigues <l...@redhat.com>
---
cli/job.py | 1 -
cli/job_unittest.py | 13 ++++++-------
server/frontend.py | 3 +--
3 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/cli/job.py b/cli/job.py
index ddb534f..e80becf 100644
--- a/cli/job.py
+++ b/cli/job.py
@@ -459,7 +459,6 @@ class job_create(job_create_or_clone):
if options.kernel:
self.ctrl_file_data['kernel'] = self._get_kernel_data(
options.kernel, options.kernel_cmdline)
- self.ctrl_file_data['do_push_packages'] = True
if options.control_file:
try:
control_file_f = open(options.control_file)
diff --git a/cli/job_unittest.py b/cli/job_unittest.py
index 06d9df1..484be47 100755
--- a/cli/job_unittest.py
+++ b/cli/job_unittest.py
@@ -792,7 +792,6 @@ class job_create_unittest(cli_mock.cli_unittest):
'--ignore_site_file'],
rpcs=[('generate_control_file',
{'client_control_file': self.trivial_ctrl_file,
- 'do_push_packages': True,
'kernel': [{'version': 'Kernel'}]},
True,
{'control_file': data['control_file'],
@@ -901,8 +900,8 @@ class job_create_unittest(cli_mock.cli_unittest):
'--ignore_site_file'],
rpcs=[('generate_control_file',
{'tests': ['sleeptest'],
- 'kernel': [{'version': 'kernel'}],
- 'do_push_packages': True},
+ 'kernel': [{'version': 'kernel'}]
+ },
True,
{'control_file' : self.kernel_ctrl_file,
'synch_count' : 1,
@@ -925,8 +924,8 @@ class job_create_unittest(cli_mock.cli_unittest):
'kernel': [{'version': 'kernel1',
'cmdline': 'arg1 arg2'},
{'version': 'kernel2',
- 'cmdline': 'arg1 arg2'}],
- 'do_push_packages': True},
+ 'cmdline': 'arg1 arg2'}]
+ },
True,
{'control_file' : self.kernel_ctrl_file,
'synch_count' : 1,
@@ -946,8 +945,8 @@ class job_create_unittest(cli_mock.cli_unittest):
'-m', 'host0', '--ignore_site_file'],
rpcs=[('generate_control_file',
{'tests': ['sleeptest'],
- 'kernel': [{'version': 'kernel'}],
- 'do_push_packages': True},
+ 'kernel': [{'version': 'kernel'}]
+ },
True,
{'control_file' : self.kernel_ctrl_file,
'synch_count' : 1,
diff --git a/server/frontend.py b/server/frontend.py
index 353ccab..0850c58 100644
--- a/server/frontend.py
+++ b/server/frontend.py
@@ -287,8 +287,7 @@ class AFE(RpcClient):
else:
kernel_info = None
control_file = self.generate_control_file(
- tests=tests, kernel=kernel_info, use_container=use_container,
- do_push_packages=True)
+ tests=tests, kernel=kernel_info, use_container=use_container)
if control_file.is_server:
dargs['control_type'] = 'Server'
else:
--
1.7.4
_______________________________________________
Autotest mailing list
Autotest@test.kernel.org
http://test.kernel.org/cgi-bin/mailman/listinfo/autotest
