Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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 3 changed files with 7 additions and 10 deletions. Show diff stats Hide diff stats

  1. +0 1  cli/job.py
  2. +6 7 cli/job_unittest.py
  3. +1 2  server/frontend.py
1  cli/job.py
@@ -459,7 +459,6 @@ def parse(self):
459 459 if options.kernel:
460 460 self.ctrl_file_data['kernel'] = self._get_kernel_data(
461 461 options.kernel, options.kernel_cmdline)
462   - self.ctrl_file_data['do_push_packages'] = True
463 462 if options.control_file:
464 463 try:
465 464 control_file_f = open(options.control_file)
13 cli/job_unittest.py
@@ -792,7 +792,6 @@ def test_execute_create_job_with_control_and_kernel(self):
792 792 '--ignore_site_file'],
793 793 rpcs=[('generate_control_file',
794 794 {'client_control_file': self.trivial_ctrl_file,
795   - 'do_push_packages': True,
796 795 'kernel': [{'version': 'Kernel'}]},
797 796 True,
798 797 {'control_file': data['control_file'],
@@ -901,8 +900,8 @@ def test_execute_create_job_with_kernel(self):
901 900 '--ignore_site_file'],
902 901 rpcs=[('generate_control_file',
903 902 {'tests': ['sleeptest'],
904   - 'kernel': [{'version': 'kernel'}],
905   - 'do_push_packages': True},
  903 + 'kernel': [{'version': 'kernel'}]
  904 + },
906 905 True,
907 906 {'control_file' : self.kernel_ctrl_file,
908 907 'synch_count' : 1,
@@ -925,8 +924,8 @@ def test_execute_create_job_with_kernels_and_cmdline(self):
925 924 'kernel': [{'version': 'kernel1',
926 925 'cmdline': 'arg1 arg2'},
927 926 {'version': 'kernel2',
928   - 'cmdline': 'arg1 arg2'}],
929   - 'do_push_packages': True},
  927 + 'cmdline': 'arg1 arg2'}]
  928 + },
930 929 True,
931 930 {'control_file' : self.kernel_ctrl_file,
932 931 'synch_count' : 1,
@@ -946,8 +945,8 @@ def test_execute_create_job_with_kernel_spaces(self):
946 945 '-m', 'host0', '--ignore_site_file'],
947 946 rpcs=[('generate_control_file',
948 947 {'tests': ['sleeptest'],
949   - 'kernel': [{'version': 'kernel'}],
950   - 'do_push_packages': True},
  948 + 'kernel': [{'version': 'kernel'}]
  949 + },
951 950 True,
952 951 {'control_file' : self.kernel_ctrl_file,
953 952 'synch_count' : 1,
3  server/frontend.py
@@ -287,8 +287,7 @@ def create_job_by_test(self, tests, kernel=None, use_container=False,
287 287 else:
288 288 kernel_info = None
289 289 control_file = self.generate_control_file(
290   - tests=tests, kernel=kernel_info, use_container=use_container,
291   - do_push_packages=True)
  290 + tests=tests, kernel=kernel_info, use_container=use_container)
292 291 if control_file.is_server:
293 292 dargs['control_type'] = 'Server'
294 293 else:

0 comments on commit e5ffdfd

Please sign in to comment.
Something went wrong with that request. Please try again.