From e33085889f26c76587fdab2ad600ed336dc028b5 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sat, 6 Oct 2018 23:35:00 +0200 Subject: Improve ssh error reporting in some tasks --- kpov_judge/tasks/public_ip_ssh/task.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'kpov_judge/tasks/public_ip_ssh/task.py') diff --git a/kpov_judge/tasks/public_ip_ssh/task.py b/kpov_judge/tasks/public_ip_ssh/task.py index a566aa5..02c4ac5 100644 --- a/kpov_judge/tasks/public_ip_ssh/task.py +++ b/kpov_judge/tasks/public_ip_ssh/task.py @@ -43,17 +43,15 @@ def gen_params(user_id, params_meta): def task_check(results, params): from pexpect import pxssh - import pexpect - results = dict() - s = pxssh.pxssh() - peer_ip, peer_user, peer_passwd = params['peer_ip'], params['peer_user'], params['peer_passwd'] + ip, user, passwd = params['peer_ip'], params['peer_user'], params['peer_passwd'] + results = {} try: - s.login(peer_ip, peer_user, peer_passwd) + s = pxssh.pxssh(encoding='utf-8') + s.login(ip, user, passwd) s.logout() - except Exception as e: - return 0, [str(e)] - return 10, [] + return 10, [] + except Exception as ex: + return 0, [str(ex)] def prepare_disks(templates, task_params, global_params): write_default_config(templates['simpleArbiter'], global_params) - # print d1.ls('/') -- cgit v1.2.1 From 9c51bbe5016495c714789f5df01806a6d366e11a Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sat, 6 Oct 2018 23:56:03 +0200 Subject: Rename kpov_random_helpers to kpov_util --- kpov_judge/tasks/public_ip_ssh/task.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kpov_judge/tasks/public_ip_ssh/task.py') diff --git a/kpov_judge/tasks/public_ip_ssh/task.py b/kpov_judge/tasks/public_ip_ssh/task.py index 02c4ac5..9085cf0 100644 --- a/kpov_judge/tasks/public_ip_ssh/task.py +++ b/kpov_judge/tasks/public_ip_ssh/task.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # bson.son.SON an -# kpov_random_helpers should be imported by add_assignment.py +# kpov_util should be imported by add_assignment.py OrderedDict = SON instructions = { @@ -39,7 +39,7 @@ def task(peer_ip, peer_user, peer_passwd): return dict() def gen_params(user_id, params_meta): - return kpov_random_helpers.default_gen(user_id, params_meta) + return kpov_util.default_gen(user_id, params_meta) def task_check(results, params): from pexpect import pxssh -- cgit v1.2.1 From 3091fc2877600f7926ed6a596c316183499125f8 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sun, 7 Oct 2018 19:11:49 +0200 Subject: Remove coding: lines Python 3 source is utf-8 by default. --- kpov_judge/tasks/public_ip_ssh/task.py | 1 - 1 file changed, 1 deletion(-) (limited to 'kpov_judge/tasks/public_ip_ssh/task.py') diff --git a/kpov_judge/tasks/public_ip_ssh/task.py b/kpov_judge/tasks/public_ip_ssh/task.py index 9085cf0..a33564c 100644 --- a/kpov_judge/tasks/public_ip_ssh/task.py +++ b/kpov_judge/tasks/public_ip_ssh/task.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -# -*- coding: utf-8 -*- # bson.son.SON an # kpov_util should be imported by add_assignment.py -- cgit v1.2.1 From dbf585c2a59dbcb7f6d803d5756826b562cd7f43 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sun, 7 Oct 2018 19:38:40 +0200 Subject: Fix or remove hashbangs --- kpov_judge/tasks/public_ip_ssh/task.py | 4 ---- 1 file changed, 4 deletions(-) (limited to 'kpov_judge/tasks/public_ip_ssh/task.py') diff --git a/kpov_judge/tasks/public_ip_ssh/task.py b/kpov_judge/tasks/public_ip_ssh/task.py index a33564c..561a1fa 100644 --- a/kpov_judge/tasks/public_ip_ssh/task.py +++ b/kpov_judge/tasks/public_ip_ssh/task.py @@ -1,8 +1,4 @@ -#!/usr/bin/env python - -# bson.son.SON an # kpov_util should be imported by add_assignment.py -OrderedDict = SON instructions = { 'si':""" -- cgit v1.2.1