Commit 72d137c0 authored by Paul Rich's avatar Paul Rich
Browse files

Client test update and removal of stray prints

parent 9d016e1a
......@@ -575,7 +575,6 @@ def main():
not_exit_on_interrupt()
opts['qsub_host'] = socket.gethostname()
print opts['qsub_host']
opts = client_utils.component_call(SYSMGR, False, 'validate_job',(opts,))
impl = client_utils.component_call(SYSMGR, False, 'get_implementation',())
exit_on_interrupt()
......@@ -584,7 +583,6 @@ def main():
# If we're interactive, remote and go.
if opts['mode'] == 'interactive':
if opts.get('ssh_host', None) is not None:
print opts['qsub_host'], opts.get('ssh_host', None)
if opts['qsub_host'] != opts['ssh_host']:
#remote execute qsub on the ssh_host
client_utils.logger.info('Connecting to %s for interactive qsub...', opts['ssh_host'])
......
......@@ -9,8 +9,8 @@ test_argslist - is a list of dictionaries, each dictionary has all the necessary
"""
test_argslist = [
{ "tc_name" : "all_options_1", "args" : """-v -A myproj --attrs=a=1:b=2 --cwd /tmp -d --debuglog=/tmp/d --dependencies=1:2:3 -e /tmp/e --env v1=1:v2=2 --geometry 198x198x198x198 -h -i /bin/ls -M myemal@gmail.com -n10 -o /tmp/o -O tmp --proccount 10 -qqueue --run_users user1:user2:user3 --run_project -t 10 --mode script --kernel kernel -K kopts /bin/ls""", 'skip_list' : ['not_bsim'], },
{ "tc_name" : "misc_1", "args" : """--mode script -n 512 --env BG_COREDUMPDISABLED=1 --proccount 512 -t 30 -q testing /bin/ls""", 'skip_list' : ['not_bsim'], },
{ "tc_name" : "all_options_1", "args" : """-v -A myproj --attrs=a=1:b=2 --cwd /tmp -d --debuglog=/tmp/d --dependencies=1:2:3 -e /tmp/e --env v1=1:v2=2 --geometry 198x198x198x198 -h -i /bin/ls -M myemal@gmail.com -n10 -o /tmp/o -O tmp --proccount 10 -qqueue --run_users user1:user2:user3 --run_project -t 10 --mode script --kernel kernel -K kopts /bin/ls""", 'skip_list' : ['not_bsim'], 'new_only':True},
{ "tc_name" : "misc_1", "args" : """--mode script -n 512 --env BG_COREDUMPDISABLED=1 --proccount 512 -t 30 -q testing /bin/ls""", 'skip_list' : ['not_bsim'], 'new_only':True},
{ "tc_name" : "no_options_passed", "args" : """/bin/ls""", },
{ "tc_name" : "non_existant_option", "args" : """-z -t10 -n10 /bin/ls""", },
{ "tc_name" : "debug_flag_only_1", "args" : """-d""", },
......@@ -19,46 +19,46 @@ test_argslist = [
{ "tc_name" : "non_integer_nodecount", "args" : """--mode smp -t50 -nfive --geometry 40x40x50x50 /bin/ls""", },
{ "tc_name" : "non_realistic_nodecount", "args" : """--mode smp -t50 -n2048 --geometry 40x40x50x50x1 /bin/ls""", },
{ "tc_name" : "invalid_geometry_1", "args" : """--mode script -t50 -n10 --geometry x /bin/ls""", },
{ "tc_name" : "invalid_geometry_2", "args" : """--mode script -t50 -n10 --geometry 1x2x3x4 /bin/ls""", 'skip_list' : ['not_bsim'], },
{ "tc_name" : "invalid_geometry_3", "args" : """--mode script -t50 -n10 --geometry 1x2x3x4 /bin/ls""", 'skip_list' : ['not_bsim'], },
{ "tc_name" : "invalid_geometry_4", "args" : """--mode script -t50 -n10 --geometry 48x48x48x48x2 /bin/ls""", 'skip_list' : ['not_bsim'], },
{ "tc_name" : "invalid_geometry_2", "args" : """--mode script -t50 -n10 --geometry 1x2x3x4 /bin/ls""", 'skip_list' : ['not_bsim'], 'new_only':True},
{ "tc_name" : "invalid_geometry_3", "args" : """--mode script -t50 -n10 --geometry 1x2x3x4 /bin/ls""", 'skip_list' : ['not_bsim'], 'new_only':True},
{ "tc_name" : "invalid_geometry_4", "args" : """--mode script -t50 -n10 --geometry 48x48x48x48x2 /bin/ls""", 'skip_list' : ['not_bsim'], 'new_only':True},
{ "tc_name" : "invalid_geometry_5", "args" : """--mode script -t50 -n10 --geometry 48x48x48x48x3 /bin/ls""", 'skip_list' : ['not_bsim'], },
{ "tc_name" : "invalid_geometry_6", "args" : """--mode script -t50 -n10 --geometry 128x64x32x4 /bin/ls""", 'skip_list' : ['not_bsim'], },
{ "tc_name" : "no_roject_specified", "args" : """-A -t50 -n10 /bin/ls""", },
{ "tc_name" : "project_specified", "args" : """-A who -t50 -n10 /bin/ls""", },
{ "tc_name" : "Check_attrs_1", "args" : """--attrs xxxx -t50 -n10 /bin/ls""", },
{ "tc_name" : "Check_attrs_2", "args" : """--attrs 1111 -t50 -n10 /bin/ls""", },
{ "tc_name" : "Check_attrs_3", "args" : """--attrs xx=:yy -t50 -n10 /bin/ls""", },
{ "tc_name" : "Check_attrs_4", "args" : """--attrs xx=one:yy=1:zz=1one -t50 -n10 /bin/ls""", },
{ "tc_name" : "cwd_option_1", "args" : """--cwd /tmp/ -t10 -n 10 -e p /bin/ls""", },
{ "tc_name" : "cwd_option_2", "args" : """--cwd /tmp -t10 -n 10 -e p /bin/ls""", },
{ "tc_name" : "invalid_geometry_6", "args" : """--mode script -t50 -n10 --geometry 128x64x32x4 /bin/ls""", 'skip_list' : ['not_bsim'], 'new_only':True},
{ "tc_name" : "no_project_specified", "args" : """-A -t50 -n10 /bin/ls""", },
{ "tc_name" : "project_specified", "args" : """-A who -t50 -n10 /bin/ls""", 'new_only':True},
{ "tc_name" : "Check_attrs_1", "args" : """--attrs xxxx -t50 -n10 /bin/ls""", 'new_only':True},
{ "tc_name" : "Check_attrs_2", "args" : """--attrs 1111 -t50 -n10 /bin/ls""", 'new_only':True},
{ "tc_name" : "Check_attrs_3", "args" : """--attrs xx=:yy -t50 -n10 /bin/ls""", 'new_only':True},
{ "tc_name" : "Check_attrs_4", "args" : """--attrs xx=one:yy=1:zz=1one -t50 -n10 /bin/ls""", 'new_only':True},
{ "tc_name" : "cwd_option_1", "args" : """--cwd /tmp/ -t10 -n 10 -e p /bin/ls""", 'new_only':True},
{ "tc_name" : "cwd_option_2", "args" : """--cwd /tmp -t10 -n 10 -e p /bin/ls""", 'new_only':True},
{ "tc_name" : "cwd_option_3", "args" : """--cwd /x -t10 -n 10 -e p /bin/ls""", },
{ "tc_name" : "cwd_option_4", "args" : """--cwd /tmp/ -t10 -n 10 -e p -o x /bin/ls""", },
{ "tc_name" : "cwd_option_5", "args" : """--cwd /tmp -t10 -n 10 -e p -o x /bin/ls""", },
{ "tc_name" : "debuglog_option", "args" : """-t10 -n 10 -e p -o x --debuglog y /bin/ls""", },
{ "tc_name" : "cwd_option_4", "args" : """--cwd /tmp/ -t10 -n 10 -e p -o x /bin/ls""", 'new_only':True},
{ "tc_name" : "cwd_option_5", "args" : """--cwd /tmp -t10 -n 10 -e p -o x /bin/ls""", 'new_only':True},
{ "tc_name" : "debuglog_option", "args" : """-t10 -n 10 -e p -o x --debuglog y /bin/ls""", 'new_only':True},
{ "tc_name" : "inputfile_option_1", "args" : """-i none -t10 -n 10 /bin/ls""", },
{ "tc_name" : "inputfile_option_2", "args" : """-i y -t10 -n 10 /bin/ls""", },
{ "tc_name" : "email_option", "args" : """-M g -t10 -n10 /bin/ls""", },
{ "tc_name" : "outputprefix", "args" : """-O tmp -t10 -n10 /bin/ls""", },
{ "tc_name" : "inputfile_option_2", "args" : """-i y -t10 -n 10 /bin/ls""", 'new_only':True},
{ "tc_name" : "email_option", "args" : """-M g -t10 -n10 /bin/ls""", 'new_only':True},
{ "tc_name" : "outputprefix", "args" : """-O tmp -t10 -n10 /bin/ls""", 'new_only':True},
{ "tc_name" : "invalid_user", "args" : """--run_users naughtyuser -t10 -n10 /bin/ls""", },
{ "tc_name" : "mode_option_1", "args" : """-t10 -n512 --proccount 1023 --mode vn /bin/ls""", 'skip_list' : ['not_bsim'], },
{ "tc_name" : "mode_option_2", "args" : """-t10 -n512 --proccount 1023 --mode vn /bin/ls""", },
{ "tc_name" : "mode_option_3", "args" : """--mode script -t50 -n10 --geometry 40x40x50x50 /bin/ls""", 'skip_list' : ['not_bsim'], },
{ "tc_name" : "mode_option_1", "args" : """-t10 -n512 --proccount 1023 --mode vn /bin/ls""", 'skip_list' : ['not_bsim'], 'new_only':True},
{ "tc_name" : "mode_option_2", "args" : """-t10 -n512 --proccount 1023 --mode vn /bin/ls""", 'new_only':True},
{ "tc_name" : "mode_option_3", "args" : """--mode script -t50 -n10 --geometry 40x40x50x50 /bin/ls""", 'skip_list' : ['not_bsim'], 'new_only':True},
{ "tc_name" : "mode_option_4", "args" : """-A Acceptance -q testing -n 49152 -t 60 --mode script /bin/ls""", },
{ "tc_name" : "preboot_option", "args" : """--disable_preboot -t10 -n512 --proccount 1023 --mode vn /bin/ls""", 'skip_list' : ['not_bsim'], },
{ "tc_name" : "env_option_1", "args" : """--env var1=val1,var2=val2 -t50 -n10 /bin/ls""", },
{ "tc_name" : "env_option_2", "args" : """--env var1=val1:var2=val2 -t50 -n10 /bin/ls""", },
{ "tc_name" : "env_option_3", "args" : """--env "var1=val1:var2=svar1\=sval1\:svar2\=sval2:var3=val3" -t50 -n10 -d /bin/ls""", },
{ "tc_name" : "env_option_4", "args" : """--env var1=val1 --env "var2=svar1\=sval1\:svar2\=sval2" --env var3=val3 -t50 -n10 /bin/ls""", },
{ "tc_name" : "preboot_option", "args" : """--disable_preboot -t10 -n512 --proccount 1023 --mode vn /bin/ls""", 'skip_list' : ['not_bsim'], 'new_only':True},
{ "tc_name" : "env_option_1", "args" : """--env var1=val1,var2=val2 -t50 -n10 /bin/ls""", 'new_only':True},
{ "tc_name" : "env_option_2", "args" : """--env var1=val1:var2=val2 -t50 -n10 /bin/ls""", 'new_only':True},
{ "tc_name" : "env_option_3", "args" : """--env "var1=val1:var2=svar1\=sval1\:svar2\=sval2:var3=val3" -t50 -n10 -d /bin/ls""", 'new_only':True},
{ "tc_name" : "env_option_4", "args" : """--env var1=val1 --env "var2=svar1\=sval1\:svar2\=sval2" --env var3=val3 -t50 -n10 /bin/ls""", 'new_only':True},
{ "tc_name" : "script_1", "args" : """cobalt_script1.sh""", },
{ "tc_name" : "script_2", "args" : """-t 50 cobalt_script1.sh""", },
{ "tc_name" : "script_3", "args" : """--mode vn cobalt_script1.sh""", },
{ "tc_name" : "script_4", "args" : """-d cobalt_script2.sh""", },
{ "tc_name" : "walltime_0", "args" : """-t0 -n 10 /bin/ls""", },
{ "tc_name" : "walltime_0", "args" : """-t0 -n 10 /bin/ls""", 'new_only':True},
{ "tc_name" : "interactive_1", "args" : """-I -t50 -n 1 /bin/ls""", },
{ "tc_name" : "interactive_2", "args" : """-I -t50 -n 1 -i inputfile""", },
{ "tc_name" : "interactive_4", "args" : """-I -t50 -n 1 --mode script""", },
{ "tc_name" : "interactive_5", "args" : """-I -t50 -n 1""", "testhook" : "JOB_RUNNING"},
{ "tc_name" : "interactive_6", "args" : """--interactive -t50 -n 1""", "testhook" : "JOB_RUNNING"},
{ "tc_name" : "interactive_7", "args" : """--mode interactive -t50 -n 1""", "testhook" : "JOB_RUNNING"},
{ "tc_name" : "interactive_5", "args" : """-I -t50 -n 1""", "testhook" : "JOB_RUNNING", 'new_only':True},
{ "tc_name" : "interactive_6", "args" : """--interactive -t50 -n 1""", "testhook" : "JOB_RUNNING", 'new_only':True},
{ "tc_name" : "interactive_7", "args" : """--mode interactive -t50 -n 1""", "testhook" : "JOB_RUNNING", 'new_only':True},
]
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment