Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

job: Remove non-existant parameter on generate_control_file calls (Fi…

…x #47)

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 <lmr@redhat.com>


git-svn-id: svn://test.kernel.org/autotest/trunk@5287 592f7852-d20e-0410-864c-8624ca9c26a4
  • Loading branch information...
commit e5ffdfdf69a3644ac7b462c7ea962ded6f7307f7 1 parent 039effb
lmr authored
Showing with 7 additions and 10 deletions.
  1. +0 −1  cli/job.py
  2. +6 −7 cli/job_unittest.py
  3. +1 −2  server/frontend.py
1  cli/job.py
View
@@ -459,7 +459,6 @@ def parse(self):
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)
13 cli/job_unittest.py
View
@@ -792,7 +792,6 @@ def test_execute_create_job_with_control_and_kernel(self):
'--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 @@ def test_execute_create_job_with_kernel(self):
'--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 @@ def test_execute_create_job_with_kernels_and_cmdline(self):
'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 @@ def test_execute_create_job_with_kernel_spaces(self):
'-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,
3  server/frontend.py
View
@@ -287,8 +287,7 @@ def create_job_by_test(self, tests, kernel=None, use_container=False,
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:
Please sign in to comment.
Something went wrong with that request. Please try again.