[autotest] Remove site specific stuff from cli
BUG=chromium:672727
TEST=Run unittests
Change-Id: Ib3b420d95f59f8afd0e90eb598f2988703ebfa14
Reviewed-on: https://chromium-review.googlesource.com/435473
Commit-Ready: Allen Li <ayatane@chromium.org>
Tested-by: Allen Li <ayatane@chromium.org>
Reviewed-by: Allen Li <ayatane@chromium.org>
diff --git a/cli/atest.py b/cli/atest.py
index bdcecb5..8dea71b 100644
--- a/cli/atest.py
+++ b/cli/atest.py
@@ -8,7 +8,7 @@
See topic_common.py for a High Level Design and Algorithm.
This file figures out the topic and action from the 2 first arguments
-on the command line and imports the site_<topic> or <topic> module.
+on the command line and imports the <topic> module.
It then creates a <topic>_<action> object, and calls it parses),
execute() and output() methods.
@@ -22,9 +22,6 @@
from autotest_lib.cli import topic_common
from autotest_lib.server import utils
-# Topics that no longer user site_ files
-MERGED_TOPICS = ['host']
-
def main():
"""
@@ -54,21 +51,9 @@
sys.argv.insert(1, '-h')
syntax_obj.parse()
- # The ignore flag should *only* be used by unittests.
- ignore_site = '--ignore_site_file' in sys.argv
- if ignore_site:
- sys.argv.remove('--ignore_site_file')
-
- # Ignore site logic for topics that have been merged
- # TODO(jgiorgi): remove all site logic and this hack
- ignore_site = ignore_site or topic in MERGED_TOPICS
-
# Import the topic specific file
cli_dir = os.path.abspath(os.path.dirname(__file__))
- if (not ignore_site and
- os.path.exists(os.path.join(cli_dir, 'site_%s.py' % topic))):
- topic = 'site_%s' % topic
- elif not os.path.exists(os.path.join(cli_dir, '%s.py' % topic)):
+ if not os.path.exists(os.path.join(cli_dir, '%s.py' % topic)):
syntax_obj.invalid_syntax('Invalid topic %s' % topic)
topic_module = common.setup_modules.import_module(topic,
'autotest_lib.cli')
diff --git a/cli/host_unittest.py b/cli/host_unittest.py
index 2164c45..5d8a54e 100755
--- a/cli/host_unittest.py
+++ b/cli/host_unittest.py
@@ -120,7 +120,7 @@
def test_execute_list_all_no_labels(self):
- self.run_cmd(argv=['atest', 'host', 'list', '--ignore_site_file'],
+ self.run_cmd(argv=['atest', 'host', 'list'],
rpcs=[('get_hosts', {},
True,
[{u'status': u'Ready',
@@ -152,7 +152,7 @@
def test_execute_list_all_with_labels(self):
- self.run_cmd(argv=['atest', 'host', 'list', '--ignore_site_file'],
+ self.run_cmd(argv=['atest', 'host', 'list'],
rpcs=[('get_hosts', {},
True,
[{u'status': u'Ready',
@@ -185,8 +185,7 @@
def test_execute_list_filter_one_host(self):
- self.run_cmd(argv=['atest', 'host', 'list', 'host1',
- '--ignore_site_file'],
+ self.run_cmd(argv=['atest', 'host', 'list', 'host1'],
rpcs=[('get_hosts', {'hostname__in': ['host1']},
True,
[{u'status': u'Ready',
@@ -210,7 +209,7 @@
def test_execute_list_filter_two_hosts(self):
mfile = cli_mock.create_file('host2')
self.run_cmd(argv=['atest', 'host', 'list', 'host1',
- '--mlist', mfile.name, '--ignore_site_file'],
+ '--mlist', mfile.name],
# This is a bit fragile as the list order may change...
rpcs=[('get_hosts', {'hostname__in': ['host2', 'host1']},
True,
@@ -248,7 +247,7 @@
def test_execute_list_filter_two_hosts_one_not_found(self):
mfile = cli_mock.create_file('host2')
self.run_cmd(argv=['atest', 'host', 'list', 'host1',
- '--mlist', mfile.name, '--ignore_site_file'],
+ '--mlist', mfile.name],
# This is a bit fragile as the list order may change...
rpcs=[('get_hosts', {'hostname__in': ['host2', 'host1']},
True,
@@ -273,7 +272,7 @@
def test_execute_list_filter_two_hosts_none_found(self):
self.run_cmd(argv=['atest', 'host', 'list',
- 'host1', 'host2', '--ignore_site_file'],
+ 'host1', 'host2'],
# This is a bit fragile as the list order may change...
rpcs=[('get_hosts', {'hostname__in': ['host2', 'host1']},
True,
@@ -285,7 +284,7 @@
def test_execute_list_filter_label(self):
self.run_cmd(argv=['atest', 'host', 'list',
- '-b', 'label3', '--ignore_site_file'],
+ '-b', 'label3'],
rpcs=[('get_hosts', {'labels__name__in': ['label3']},
True,
[{u'status': u'Ready',
@@ -320,7 +319,7 @@
def test_execute_list_filter_multi_labels(self):
self.run_cmd(argv=['atest', 'host', 'list',
- '-b', 'label3,label2', '--ignore_site_file'],
+ '-b', 'label3,label2'],
rpcs=[('get_hosts', {'multiple_labels': ['label2',
'label3']},
True,
@@ -355,8 +354,7 @@
def test_execute_list_filter_three_labels(self):
self.run_cmd(argv=['atest', 'host', 'list',
- '-b', 'label3,label2, label4',
- '--ignore_site_file'],
+ '-b', 'label3,label2, label4'],
rpcs=[('get_hosts', {'multiple_labels': ['label2',
'label3',
'label4']},
@@ -381,8 +379,7 @@
def test_execute_list_filter_wild_labels(self):
self.run_cmd(argv=['atest', 'host', 'list',
- '-b', 'label*',
- '--ignore_site_file'],
+ '-b', 'label*'],
rpcs=[('get_hosts',
{'labels__name__startswith': 'label'},
True,
@@ -406,7 +403,7 @@
def test_execute_list_filter_multi_labels_no_results(self):
self.run_cmd(argv=['atest', 'host', 'list',
- '-b', 'label3,label2, ', '--ignore_site_file'],
+ '-b', 'label3,label2, '],
rpcs=[('get_hosts', {'multiple_labels': ['label2',
'label3']},
True,
@@ -418,7 +415,7 @@
def test_execute_list_filter_label_and_hosts(self):
self.run_cmd(argv=['atest', 'host', 'list', 'host1',
- '-b', 'label3', 'host2', '--ignore_site_file'],
+ '-b', 'label3', 'host2'],
rpcs=[('get_hosts', {'labels__name__in': ['label3'],
'hostname__in': ['host2', 'host1']},
True,
@@ -454,7 +451,7 @@
def test_execute_list_filter_label_and_hosts_none(self):
self.run_cmd(argv=['atest', 'host', 'list', 'host1',
- '-b', 'label3', 'host2', '--ignore_site_file'],
+ '-b', 'label3', 'host2'],
rpcs=[('get_hosts', {'labels__name__in': ['label3'],
'hostname__in': ['host2', 'host1']},
True,
@@ -466,7 +463,7 @@
def test_execute_list_filter_status(self):
self.run_cmd(argv=['atest', 'host', 'list',
- '-s', 'Ready', '--ignore_site_file'],
+ '-s', 'Ready'],
rpcs=[('get_hosts', {'status__in': ['Ready']},
True,
[{u'status': u'Ready',
@@ -502,7 +499,7 @@
def test_execute_list_filter_status_and_hosts(self):
self.run_cmd(argv=['atest', 'host', 'list', 'host1',
- '-s', 'Ready', 'host2', '--ignore_site_file'],
+ '-s', 'Ready', 'host2'],
rpcs=[('get_hosts', {'status__in': ['Ready'],
'hostname__in': ['host2', 'host1']},
True,
@@ -539,7 +536,7 @@
def test_execute_list_filter_status_and_hosts_none(self):
self.run_cmd(argv=['atest', 'host', 'list', 'host1',
'--status', 'Repair',
- 'host2', '--ignore_site_file'],
+ 'host2'],
rpcs=[('get_hosts', {'status__in': ['Repair'],
'hostname__in': ['host2', 'host1']},
True,
@@ -552,7 +549,7 @@
def test_execute_list_filter_statuses_and_hosts_none(self):
self.run_cmd(argv=['atest', 'host', 'list', 'host1',
'--status', 'Repair',
- 'host2', '--ignore_site_file'],
+ 'host2'],
rpcs=[('get_hosts', {'status__in': ['Repair'],
'hostname__in': ['host2', 'host1']},
True,
@@ -564,7 +561,7 @@
def test_execute_list_filter_locked(self):
self.run_cmd(argv=['atest', 'host', 'list', 'host1',
- '--locked', 'host2', '--ignore_site_file'],
+ '--locked', 'host2'],
rpcs=[('get_hosts', {'locked': True,
'hostname__in': ['host2', 'host1']},
True,
@@ -600,7 +597,7 @@
def test_execute_list_filter_unlocked(self):
self.run_cmd(argv=['atest', 'host', 'list',
- '--unlocked', '--ignore_site_file'],
+ '--unlocked'],
rpcs=[('get_hosts', {'locked': False},
True,
[{u'status': u'Ready',
@@ -636,8 +633,7 @@
class host_stat_unittest(cli_mock.cli_unittest):
def test_execute_stat_two_hosts(self):
# The order of RPCs between host1 and host0 could change...
- self.run_cmd(argv=['atest', 'host', 'stat', 'host0', 'host1',
- '--ignore_site_file'],
+ self.run_cmd(argv=['atest', 'host', 'stat', 'host0', 'host1'],
rpcs=[('get_hosts', {'hostname': 'host1'},
True,
[{u'status': u'Ready',
@@ -714,7 +710,7 @@
def test_execute_stat_one_bad_host_verbose(self):
self.run_cmd(argv=['atest', 'host', 'stat', 'host0',
- 'host1', '-v', '--ignore_site_file'],
+ 'host1', '-v'],
rpcs=[('get_hosts', {'hostname': 'host1'},
True,
[]),
@@ -765,8 +761,7 @@
def test_execute_stat_one_bad_host(self):
- self.run_cmd(argv=['atest', 'host', 'stat', 'host0', 'host1',
- '--ignore_site_file'],
+ self.run_cmd(argv=['atest', 'host', 'stat', 'host0', 'host1'],
rpcs=[('get_hosts', {'hostname': 'host1'},
True,
[]),
@@ -818,8 +813,7 @@
def test_execute_stat_wildcard(self):
# The order of RPCs between host1 and host0 could change...
- self.run_cmd(argv=['atest', 'host', 'stat', 'ho*',
- '--ignore_site_file'],
+ self.run_cmd(argv=['atest', 'host', 'stat', 'ho*'],
rpcs=[('get_hosts', {'hostname__startswith': 'ho'},
True,
[{u'status': u'Ready',
@@ -892,8 +886,7 @@
def test_execute_stat_wildcard_and_host(self):
# The order of RPCs between host1 and host0 could change...
- self.run_cmd(argv=['atest', 'host', 'stat', 'ho*', 'newhost0',
- '--ignore_site_file'],
+ self.run_cmd(argv=['atest', 'host', 'stat', 'ho*', 'newhost0'],
rpcs=[('get_hosts', {'hostname': 'newhost0'},
True,
[{u'status': u'Ready',
@@ -1006,8 +999,7 @@
class host_jobs_unittest(cli_mock.cli_unittest):
def test_execute_jobs_one_host(self):
- self.run_cmd(argv=['atest', 'host', 'jobs', 'host0',
- '--ignore_site_file'],
+ self.run_cmd(argv=['atest', 'host', 'jobs', 'host0'],
rpcs=[('get_host_queue_entries',
{'host__hostname': 'host0', 'query_limit': 20,
'sort_by': ['-job__id']},
@@ -1068,8 +1060,7 @@
def test_execute_jobs_wildcard(self):
- self.run_cmd(argv=['atest', 'host', 'jobs', 'ho*',
- '--ignore_site_file'],
+ self.run_cmd(argv=['atest', 'host', 'jobs', 'ho*'],
rpcs=[('get_hosts', {'hostname__startswith': 'ho'},
True,
[{u'status': u'Ready',
@@ -1205,8 +1196,7 @@
def test_execute_jobs_one_host_limit(self):
- self.run_cmd(argv=['atest', 'host', 'jobs', 'host0',
- '--ignore_site_file', '-q', '10'],
+ self.run_cmd(argv=['atest', 'host', 'jobs', 'host0', '-q', '10'],
rpcs=[('get_host_queue_entries',
{'host__hostname': 'host0', 'query_limit': 10,
'sort_by': ['-job__id']},
diff --git a/cli/job_unittest.py b/cli/job_unittest.py
index 2279407..f0b5e1e 100755
--- a/cli/job_unittest.py
+++ b/cli/job_unittest.py
@@ -109,7 +109,7 @@
def test_job_list_jobs(self):
self.god.stub_function(getpass, 'getuser')
getpass.getuser.expect_call().and_return('user0')
- self.run_cmd(argv=['atest', 'job', 'list', '--ignore_site_file'],
+ self.run_cmd(argv=['atest', 'job', 'list'],
rpcs=[('get_jobs_summary', {'owner': 'user0',
'running': None},
True, self.values)],
@@ -119,8 +119,7 @@
def test_job_list_jobs_only_user(self):
values = [item for item in self.values if item['owner'] == 'Cringer']
- self.run_cmd(argv=['atest', 'job', 'list', '-u', 'Cringer',
- '--ignore_site_file'],
+ self.run_cmd(argv=['atest', 'job', 'list', '-u', 'Cringer'],
rpcs=[('get_jobs_summary', {'owner': 'Cringer',
'running': None},
True, values)],
@@ -130,8 +129,7 @@
def test_job_list_jobs_all(self):
- self.run_cmd(argv=['atest', 'job', 'list', '--all',
- '--ignore_site_file'],
+ self.run_cmd(argv=['atest', 'job', 'list', '--all'],
rpcs=[('get_jobs_summary', {'running': None},
True, self.values)],
out_words_ok=['Fisto', 'Roboto', 'Panthor',
@@ -140,8 +138,7 @@
def test_job_list_jobs_id(self):
- self.run_cmd(argv=['atest', 'job', 'list', '5964',
- '--ignore_site_file'],
+ self.run_cmd(argv=['atest', 'job', 'list', '5964'],
rpcs=[('get_jobs_summary', {'id__in': ['5964'],
'running': None},
True,
@@ -161,8 +158,7 @@
def test_job_list_jobs_id_verbose(self):
- self.run_cmd(argv=['atest', 'job', 'list', '5964', '-v',
- '--ignore_site_file'],
+ self.run_cmd(argv=['atest', 'job', 'list', '5964', '-v'],
rpcs=[('get_jobs_summary', {'id__in': ['5964'],
'running': None},
True,
@@ -183,8 +179,7 @@
def test_job_list_jobs_name(self):
- self.run_cmd(argv=['atest', 'job', 'list', 'myt*',
- '--ignore_site_file'],
+ self.run_cmd(argv=['atest', 'job', 'list', 'myt*'],
rpcs=[('get_jobs_summary', {'name__startswith': 'myt',
'running': None},
True,
@@ -204,8 +199,7 @@
def test_job_list_jobs_all_verbose(self):
- self.run_cmd(argv=['atest', 'job', 'list', '--all', '--verbose',
- '--ignore_site_file'],
+ self.run_cmd(argv=['atest', 'job', 'list', '--all', '--verbose'],
rpcs=[('get_jobs_summary', {'running': None},
True, self.values)],
out_words_ok=['Fisto', 'Spikor', 'Cringer', 'Priority',
@@ -215,8 +209,7 @@
class job_list_jobs_all_and_user_unittest(cli_mock.cli_unittest):
def test_job_list_jobs_all_and_user(self):
testjob = job.job_list()
- sys.argv = ['atest', 'job', 'list', '-a', '-u', 'user0',
- '--ignore_site_file']
+ sys.argv = ['atest', 'job', 'list', '-a', '-u', 'user0']
self.god.mock_io()
(sys.exit.expect_call(mock.anything_comparator())
.and_raises(cli_mock.ExitException))
@@ -228,8 +221,7 @@
class job_stat_unittest(job_unittest):
def test_job_stat_job(self):
results = copy.deepcopy(self.results)
- self.run_cmd(argv=['atest', 'job', 'stat', '180',
- '--ignore_site_file'],
+ self.run_cmd(argv=['atest', 'job', 'stat', '180'],
rpcs=[('get_jobs_summary', {'id__in': ['180']}, True,
[results[0]]),
('get_host_queue_entries', {'job__in': ['180']},
@@ -262,7 +254,7 @@
def test_job_stat_list_unassigned_host(self):
self.run_cmd(argv=['atest', 'job', 'stat', '6761',
- '--list-hosts', '--ignore_site_file'],
+ '--list-hosts'],
rpcs=[('get_jobs_summary', {'id__in': ['6761']}, True,
[{u'status_counts': {u'Queued': 1},
u'control_file': u'def step_init():\n job.next_step(\'step0\')\n\ndef step0():\n AUTHOR = "mbligh@google.com (Martin Bligh)"\n NAME = "Kernbench"\n TIME = "SHORT"\n TEST_CLASS = "Kernel"\n TEST_CATEGORY = "Benchmark"\n TEST_TYPE = "client"\n \n DOC = """\n A standard CPU benchmark. Runs a kernel compile and measures the performance.\n """\n \n job.run_test(\'kernbench\')',
@@ -301,7 +293,7 @@
def test_job_stat_list_hosts(self):
self.run_cmd(argv=['atest', 'job', 'stat', '6761',
- '--list-hosts', '--ignore_site_file'],
+ '--list-hosts'],
rpcs=[('get_jobs_summary', {'id__in': ['6761']}, True,
[{u'status_counts': {u'Queued': 1},
u'control_file': u'def step_init():\n job.next_step(\'step0\')\n\ndef step0():\n AUTHOR = "mbligh@google.com (Martin Bligh)"\n NAME = "Kernbench"\n TIME = "SHORT"\n TEST_CLASS = "Kernel"\n TEST_CATEGORY = "Benchmark"\n TEST_TYPE = "client"\n \n DOC = """\n A standard CPU benchmark. Runs a kernel compile and measures the performance.\n """\n \n job.run_test(\'kernbench\')',
@@ -375,8 +367,7 @@
def test_job_stat_list_hosts_status(self):
self.run_cmd(argv=['atest', 'job', 'stat', '6761',
- '--list-hosts-status', 'Running,Queued',
- '--ignore_site_file'],
+ '--list-hosts-status', 'Running,Queued'],
rpcs=[('get_jobs_summary', {'id__in': ['6761']}, True,
[{u'status_counts': {u'Queued': 1, u'Running': 1},
u'control_file': u'def step_init():\n job.next_step(\'step0\')\n\ndef step0():\n AUTHOR = "mbligh@google.com (Martin Bligh)"\n NAME = "Kernbench"\n TIME = "SHORT"\n TEST_CLASS = "Kernel"\n TEST_CATEGORY = "Benchmark"\n TEST_TYPE = "client"\n \n DOC = """\n A standard CPU benchmark. Runs a kernel compile and measures the performance.\n """\n \n job.run_test(\'kernbench\')',
@@ -449,8 +440,7 @@
def test_job_stat_job_multiple_hosts(self):
- self.run_cmd(argv=['atest', 'job', 'stat', '6761',
- '--ignore_site_file'],
+ self.run_cmd(argv=['atest', 'job', 'stat', '6761'],
rpcs=[('get_jobs_summary', {'id__in': ['6761']}, True,
[{u'status_counts': {u'Running': 1,
u'Queued': 4},
@@ -571,8 +561,7 @@
def test_job_stat_job_no_host_in_qes(self):
results = copy.deepcopy(self.results)
- self.run_cmd(argv=['atest', 'job', 'stat', '180',
- '--ignore_site_file'],
+ self.run_cmd(argv=['atest', 'job', 'stat', '180'],
rpcs=[('get_jobs_summary', {'id__in': ['180']}, True,
[results[0]]),
('get_host_queue_entries', {'job__in': ['180']},
@@ -597,8 +586,7 @@
def test_job_stat_multi_jobs(self):
results = copy.deepcopy(self.results)
- self.run_cmd(argv=['atest', 'job', 'stat', '180', '338',
- '--ignore_site_file'],
+ self.run_cmd(argv=['atest', 'job', 'stat', '180', '338'],
rpcs=[('get_jobs_summary', {'id__in': ['180', '338']},
True, results),
('get_host_queue_entries',
@@ -648,8 +636,7 @@
def test_job_stat_multi_jobs_name_id(self):
- self.run_cmd(argv=['atest', 'job', 'stat', 'mytest', '180',
- '--ignore_site_file'],
+ self.run_cmd(argv=['atest', 'job', 'stat', 'mytest', '180'],
rpcs=[('get_jobs_summary', {'id__in': ['180']},
True,
[{u'status_counts': {u'Aborted': 1},
@@ -745,7 +732,7 @@
def test_execute_create_job(self):
self.run_cmd(argv=['atest', 'job', 'create', '-t', 'sleeptest',
- 'test_job0', '-m', 'host0', '--ignore_site_file'],
+ 'test_job0', '-m', 'host0'],
rpcs=[('generate_control_file',
{'tests': ['sleeptest']},
True,
@@ -761,7 +748,7 @@
def test_execute_create_job_with_control(self):
file_temp = cli_mock.create_file(self.ctrl_file)
self.run_cmd(argv=['atest', 'job', 'create', '-f', file_temp.name,
- 'test_job0', '-m', 'host0', '--ignore_site_file'],
+ 'test_job0', '-m', 'host0'],
rpcs=[('create_job', self.data, True, 42)],
out_words_ok=['test_job0', 'Created'],
out_words_no=['Uploading', 'Done'])
@@ -773,8 +760,7 @@
data['email_list'] = 'em'
file_temp = cli_mock.create_file(self.ctrl_file)
self.run_cmd(argv=['atest', 'job', 'create', '-f', file_temp.name,
- 'test_job0', '-m', 'host0', '-e', 'em',
- '--ignore_site_file'],
+ 'test_job0', '-m', 'host0', '-e', 'em'],
rpcs=[('create_job', data, True, 42)],
out_words_ok=['test_job0', 'Created'],
out_words_no=['Uploading', 'Done'])
@@ -786,8 +772,7 @@
data['dependencies'] = ['dep1', 'dep2']
file_temp = cli_mock.create_file(self.ctrl_file)
self.run_cmd(argv=['atest', 'job', 'create', '-f', file_temp.name,
- 'test_job0', '-m', 'host0', '-d', 'dep1, dep2 ',
- '--ignore_site_file'],
+ 'test_job0', '-m', 'host0', '-d', 'dep1, dep2 '],
rpcs=[('create_job', data, True, 42)],
out_words_ok=['test_job0', 'Created'],
out_words_no=['Uploading', 'Done'])
@@ -800,7 +785,7 @@
file_temp = cli_mock.create_file(self.ctrl_file)
self.run_cmd(argv=['atest', 'job', 'create', '-f', file_temp.name,
'test_job0', '-m', 'host0', '-d',
- 'dep1\,True, dep2\,False ', '--ignore_site_file'],
+ 'dep1\,True, dep2\,False '],
rpcs=[('create_job', data, True, 42)],
out_words_ok=['test_job0', 'Created'],
out_words_no=['Uploading', 'Done'])
@@ -812,8 +797,7 @@
data['synch_count'] = 2
file_temp = cli_mock.create_file(self.ctrl_file)
self.run_cmd(argv=['atest', 'job', 'create', '-f', file_temp.name,
- 'test_job0', '-m', 'host0', '-y', '2',
- '--ignore_site_file'],
+ 'test_job0', '-m', 'host0', '-y', '2'],
rpcs=[('create_job', data, True, 42)],
out_words_ok=['test_job0', 'Created'],
out_words_no=['Uploading', 'Done'])
@@ -824,8 +808,7 @@
data = self.data.copy()
data['dependencies'] = ['dep1', 'dep2', 'dep3']
self.run_cmd(argv=['atest', 'job', 'create', '-t', 'sleeptest',
- 'test_job0', '-m', 'host0', '-d', 'dep1, dep2 ',
- '--ignore_site_file'],
+ 'test_job0', '-m', 'host0', '-d', 'dep1, dep2 '],
rpcs=[('generate_control_file',
{'tests': ['sleeptest']},
True,
@@ -843,7 +826,7 @@
data['dependencies'] = ['dep1,True', 'dep2,False', 'dep3,123']
self.run_cmd(argv=['atest', 'job', 'create', '-t', 'sleeptest',
'test_job0', '-m', 'host0', '-d',
- 'dep1\,True dep2\,False ', '--ignore_site_file'],
+ 'dep1\,True dep2\,False '],
rpcs=[('generate_control_file',
{'tests': ['sleeptest']},
True,
@@ -858,7 +841,7 @@
def test_execute_create_job_no_args(self):
testjob = job.job_create()
- sys.argv = ['atest', 'job', 'create', '--ignore_site_file']
+ sys.argv = ['atest', 'job', 'create']
self.god.mock_io()
(sys.exit.expect_call(mock.anything_comparator())
.and_raises(cli_mock.ExitException))
@@ -870,8 +853,7 @@
def test_execute_create_job_no_hosts(self):
testjob = job.job_create()
file_temp = cli_mock.create_file(self.ctrl_file)
- sys.argv = ['atest', '-f', file_temp.name, 'test_job0',
- '--ignore_site_file']
+ sys.argv = ['atest', '-f', file_temp.name, 'test_job0']
self.god.mock_io()
(sys.exit.expect_call(mock.anything_comparator())
.and_raises(cli_mock.ExitException))
@@ -884,8 +866,7 @@
def test_execute_create_job_cfile_and_tests(self):
testjob = job.job_create()
sys.argv = ['atest', 'job', 'create', '-t', 'sleeptest', '-f',
- 'control_file', 'test_job0', '-m', 'host0',
- '--ignore_site_file']
+ 'control_file', 'test_job0', '-m', 'host0']
self.god.mock_io()
(sys.exit.expect_call(mock.anything_comparator())
.and_raises(cli_mock.ExitException))
@@ -897,7 +878,7 @@
def test_execute_create_job_bad_cfile(self):
testjob = job.job_create()
sys.argv = ['atest', 'job', 'create', '-f', 'control_file',
- 'test_job0', '-m', 'host0', '--ignore_site_file']
+ 'test_job0', '-m', 'host0']
self.god.mock_io()
(sys.exit.expect_call(mock.anything_comparator())
.and_raises(IOError))
@@ -908,7 +889,7 @@
def test_execute_create_job_bad_priority(self):
testjob = job.job_create()
sys.argv = ['atest', 'job', 'create', '-t', 'sleeptest', '-p', 'Uber',
- '-m', 'host0', 'test_job0', '--ignore_site_file']
+ '-m', 'host0', 'test_job0']
self.god.mock_io()
(sys.exit.expect_call(mock.anything_comparator())
.and_raises(cli_mock.ExitException))
@@ -923,7 +904,7 @@
ctemp = cli_mock.create_file(self.ctrl_file)
file_temp = cli_mock.create_file('host0\nhost1\nhost2\nhost3')
self.run_cmd(argv=['atest', 'job', 'create', '--mlist', file_temp.name,
- '-f', ctemp.name, 'test_job0', '--ignore_site_file'],
+ '-f', ctemp.name, 'test_job0'],
rpcs=[('create_job', data, True, 42)],
out_words_ok=['test_job0', 'Created'])
ctemp.clean()
@@ -935,8 +916,7 @@
data['timeout_mins'] = '13320'
file_temp = cli_mock.create_file(self.ctrl_file)
self.run_cmd(argv=['atest', 'job', 'create', '-f', file_temp.name,
- 'test_job0', '-m', 'host0', '-o', '13320',
- '--ignore_site_file'],
+ 'test_job0', '-m', 'host0', '-o', '13320'],
rpcs=[('create_job', data, True, 42)],
out_words_ok=['test_job0', 'Created'],)
file_temp.clean()
@@ -948,7 +928,7 @@
file_temp = cli_mock.create_file(self.ctrl_file)
self.run_cmd(argv=['atest', 'job', 'create', '-f', file_temp.name,
'test_job0', '-m', 'host0', '--max_runtime',
- '13320', '--ignore_site_file'],
+ '13320'],
rpcs=[('create_job', data, True, 42)],
out_words_ok=['test_job0', 'Created'],)
file_temp.clean()
@@ -960,8 +940,7 @@
data['run_verify'] = False
file_temp = cli_mock.create_file(self.ctrl_file)
self.run_cmd(argv=['atest', 'job', 'create', '-f', file_temp.name,
- 'test_job0', '-m', 'host0', '-n',
- '--ignore_site_file'],
+ 'test_job0', '-m', 'host0', '-n'],
rpcs=[('create_job', data, True, 42)],
out_words_ok=['test_job0', 'Created'],)
file_temp.clean()
@@ -1030,8 +1009,7 @@
data['hosts'] = ['host0', 'host1', 'host2']
file_temp = cli_mock.create_file(self.ctrl_file)
self.run_cmd(argv=['atest', 'job', 'create', '-f', file_temp.name,
- 'test_job0', '-m', 'host0', '-b', 'label1,label2',
- '--ignore_site_file'],
+ 'test_job0', '-m', 'host0', '-b', 'label1,label2'],
rpcs=[('get_hosts', {'multiple_labels': ['label1',
'label2']}, True,
[{u'status': u'Running', u'lock_time': None,
@@ -1059,8 +1037,7 @@
data['hosts'] = ['host1', 'host0']
file_temp = cli_mock.create_file(self.ctrl_file)
self.run_cmd(argv=['atest', 'job', 'create', '-f', file_temp.name,
- 'test_job0', '-m', 'host0,host1', '-b', 'label1',
- '--ignore_site_file'],
+ 'test_job0', '-m', 'host0,host1', '-b', 'label1'],
rpcs=[('get_hosts', {'multiple_labels': ['label1']}, True,
[{u'status': u'Running', u'lock_time': None,
u'hostname': u'host1', u'locked': False,
@@ -1081,7 +1058,7 @@
file_temp = cli_mock.create_file(self.ctrl_file)
self.run_cmd(argv=['atest', 'job', 'create', '-f', file_temp.name,
'test_job0', '-m', 'host0,host1', '-b',
- 'label1,label\\,2', '--ignore_site_file'],
+ 'label1,label\\,2'],
rpcs=[('get_hosts', {'multiple_labels': ['label1',
'label,2']}, True,
[{u'status': u'Running', u'lock_time': None,
@@ -1103,7 +1080,7 @@
file_temp = cli_mock.create_file(self.ctrl_file)
self.run_cmd(argv=['atest', 'job', 'create', '-f', file_temp.name,
'test_job0', '-m', 'host0,host1', '-b',
- 'label1,label\\,2\\\\,label3', '--ignore_site_file'],
+ 'label1,label\\,2\\\\,label3'],
rpcs=[('get_hosts', {'multiple_labels': ['label,2\\',
'label1', 'label3']}, True,
[{u'status': u'Running', u'lock_time': None,
@@ -1339,8 +1316,7 @@
u'2008-07-08 17:45:44', u'synch_count': 2, u'id': 180}]
def test_execute_job_abort(self):
- self.run_cmd(argv=['atest', 'job', 'abort', '180',
- '--ignore_site_file'],
+ self.run_cmd(argv=['atest', 'job', 'abort', '180'],
rpcs=[('abort_host_queue_entries',
{'job__id__in': ['180']}, True, None)],
out_words_ok=['Aborting', '180'])
diff --git a/cli/label_unittest.py b/cli/label_unittest.py
index 3179449..92ac8c5 100755
--- a/cli/label_unittest.py
+++ b/cli/label_unittest.py
@@ -45,31 +45,28 @@
def test_label_list_labels_only(self):
- self.run_cmd(argv=['atest', 'label', 'list', '--ignore_site_file'],
+ self.run_cmd(argv=['atest', 'label', 'list'],
rpcs=[('get_labels', {}, True, self.values)],
out_words_ok=['label0', 'label1', 'label2'],
out_words_no=['plat0', 'plat1'])
def test_label_list_labels_only_valid(self):
- self.run_cmd(argv=['atest', 'label', 'list', '-d',
- '--ignore_site_file'],
+ self.run_cmd(argv=['atest', 'label', 'list', '-d'],
rpcs=[('get_labels', {}, True, self.values)],
out_words_ok=['label0', 'label1'],
out_words_no=['label2', 'plat0', 'plat1'])
def test_label_list_labels_and_platforms(self):
- self.run_cmd(argv=['atest', 'label', 'list', '--all',
- '--ignore_site_file'],
+ self.run_cmd(argv=['atest', 'label', 'list', '--all'],
rpcs=[('get_labels', {}, True, self.values)],
out_words_ok=['label0', 'label1', 'label2',
'plat0', 'plat1'])
def test_label_list_platforms_only(self):
- self.run_cmd(argv=['atest', 'label', 'list', '-t',
- '--ignore_site_file'],
+ self.run_cmd(argv=['atest', 'label', 'list', '-t'],
rpcs=[('get_labels', {}, True, self.values)],
out_words_ok=['plat0', 'plat1'],
out_words_no=['label0', 'label1', 'label2'])
@@ -77,7 +74,7 @@
def test_label_list_platforms_only_valid(self):
self.run_cmd(argv=['atest', 'label', 'list',
- '-t', '--valid-only', '--ignore_site_file'],
+ '-t', '--valid-only'],
rpcs=[('get_labels', {}, True, self.values)],
out_words_ok=['plat0'],
out_words_no=['label0', 'label1', 'label2',
@@ -86,8 +83,7 @@
class label_create_unittest(cli_mock.cli_unittest):
def test_execute_create_two_labels(self):
- self.run_cmd(argv=['atest', 'label', 'create', 'label0', 'label1',
- '--ignore_site_file'],
+ self.run_cmd(argv=['atest', 'label', 'create', 'label0', 'label1'],
rpcs=[('add_label',
{'name': 'label0', 'platform': False,
'only_if_needed': False},
@@ -100,8 +96,7 @@
def test_execute_create_two_labels_bad(self):
- self.run_cmd(argv=['atest', 'label', 'create', 'label0', 'label1',
- '--ignore_site_file'],
+ self.run_cmd(argv=['atest', 'label', 'create', 'label0', 'label1'],
rpcs=[('add_label',
{'name': 'label0', 'platform': False,
'only_if_needed': False},
@@ -120,8 +115,7 @@
class label_delete_unittest(cli_mock.cli_unittest):
def test_execute_delete_labels(self):
- self.run_cmd(argv=['atest', 'label', 'delete', 'label0', 'label1',
- '--ignore_site_file', '--no-confirmation'],
+ self.run_cmd(argv=['atest', 'label', 'delete', 'label0', 'label1', '--no-confirmation'],
rpcs=[('delete_label', {'id': 'label0'}, True, None),
('delete_label', {'id': 'label1'}, True, None)],
out_words_ok=['Deleted', 'label0', 'label1'])
@@ -130,7 +124,7 @@
class label_add_unittest(cli_mock.cli_unittest):
def test_execute_add_labels_to_hosts(self):
self.run_cmd(argv=['atest', 'label', 'add', 'label0',
- '--machine', 'host0,host1', '--ignore_site_file'],
+ '--machine', 'host0,host1'],
rpcs=[('label_add_hosts', {'id': 'label0',
'hosts': ['host1', 'host0']},
True, None)],
@@ -140,7 +134,7 @@
class label_remove_unittest(cli_mock.cli_unittest):
def test_execute_remove_labels_from_hosts(self):
self.run_cmd(argv=['atest', 'label', 'remove', 'label0',
- '--machine', 'host0,host1', '--ignore_site_file'],
+ '--machine', 'host0,host1'],
rpcs=[('label_remove_hosts', {'id': 'label0',
'hosts': ['host1', 'host0']},
True, None)],
diff --git a/cli/site_readme.py b/cli/site_readme.py
deleted file mode 100644
index 3abbe2b..0000000
--- a/cli/site_readme.py
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# Copyright 2008 Google Inc. All Rights Reserved.
-
-"""
-If you need to change the default behavior of some atest commands, you
-can create a site_<topic>.py file to subclass some of the classes from
-<topic>.py.
-
-The following example would prevent the creation of platform labels.
-"""
-
-import inspect, new, sys
-
-from autotest_lib.cli import topic_common, label
-
-
-class site_label(label.label):
- pass
-
-
-class site_label_create(label.label_create):
- """Disable the platform option
- atest label create <labels>|--blist <file>"""
- def __init__(self):
- super(site_label_create, self).__init__()
- self.parser.remove_option("--platform")
-
-
- def parse(self):
- (options, leftover) = super(site_label_create, self).parse()
- self.is_platform = False
- return (options, leftover)
-
-
-# The following boiler plate code should be added at the end to create
-# all the other site_<topic>_<action> classes that do not modify their
-# <topic>_<action> super class.
-
-# Any classes we don't override in label should be copied automatically
-for cls in [getattr(label, n) for n in dir(label) if not n.startswith("_")]:
- if not inspect.isclass(cls):
- continue
- cls_name = cls.__name__
- site_cls_name = 'site_' + cls_name
- if hasattr(sys.modules[__name__], site_cls_name):
- continue
- bases = (site_label, cls)
- members = {'__doc__': cls.__doc__}
- site_cls = new.classobj(site_cls_name, bases, members)
- setattr(sys.modules[__name__], site_cls_name, site_cls)
diff --git a/cli/site_suite.py b/cli/suite.py
similarity index 95%
rename from cli/site_suite.py
rename to cli/suite.py
index 7b10dd6..e11b4ec 100644
--- a/cli/site_suite.py
+++ b/cli/suite.py
@@ -20,7 +20,7 @@
from autotest_lib.cli import topic_common, action_common
-class site_suite(topic_common.atest):
+class suite(topic_common.atest):
"""Suite class
atest suite [create] [options]"""
usage_action = '[create]'
@@ -28,18 +28,18 @@
msg_items = ''
-class site_suite_help(site_suite):
+class suite_help(suite):
"""Just here to get the atest logic working.
Usage is set by its parent"""
pass
-class site_suite_create(action_common.atest_create, site_suite):
+class suite_create(action_common.atest_create, suite):
"""Class containing the code for creating a suite."""
msg_items = 'suite_id'
def __init__(self):
- super(site_suite_create, self).__init__()
+ super(suite_create, self).__init__()
self.parser.add_option('-b', '--board', help='Board to test. Required.',
metavar='BOARD')
@@ -100,7 +100,7 @@
attribute_name='delay_minutes',
inline_option='delay_minutes')
- options, leftover = site_suite.parse(
+ options, leftover = suite.parse(
self,
[suite_info, board_info, build_info, pool_info, num_info,
check_info, bugs_info, wait_for_results_info, delay_minutes_info],