diff options
| author | lmr <lmr@592f7852-d20e-0410-864c-8624ca9c26a4> | 2011-03-24 15:49:48 +0000 |
|---|---|---|
| committer | lmr <lmr@592f7852-d20e-0410-864c-8624ca9c26a4> | 2011-03-24 15:49:48 +0000 |
| commit | e5ffdfdf69a3644ac7b462c7ea962ded6f7307f7 (patch) | |
| tree | 3fe7eb33be1e878c7b80101df02f45840147d196 /cli | |
| parent | 039effb3461fb49f379d33214a289887f14abca8 (diff) | |
job: Remove non-existant parameter on generate_control_file calls (Fix #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
Diffstat (limited to 'cli')
| -rw-r--r-- | cli/job.py | 1 | ||||
| -rwxr-xr-x | cli/job_unittest.py | 13 |
2 files changed, 6 insertions, 8 deletions
@@ -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 06d9df1a..484be472 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, |