virtio_console on python2.4
PATCH 1/1 virtio_console on python2.4
This patch modifies current virtio_console test to work on python2.4. It only modifies the HOST side of the test thus it depends on "[KVM-AUTOTEST][PATCH 2/2][virtio-console] Fix compatibility with python 2.4." patch which fixes the GUEST side.
Tested on Fedora 13 with python 2.4.6.
PATCH 1/1 Add support for python2.4 virtio_console.
From: Jiří Župka <[email protected]>
--- client/tests/kvm/tests/virtio_console.py | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-)
client/tests/kvm/tests/virtio_console.py +11 -5
@@ -102,7 +102,9 @@ def run_virtio_console(test, params, env): """ @return: If any of subtest not pass return True. """ - return True if self.failed > 0 else False + if self.failed > 0: + return True + return False def get_result(self): """
@@ -121,16 +123,20 @@ def run_virtio_console(test, params, env): for arg in result[2]: sargs += str(arg) + "," sargs = sargs[:-1] - return ("Subtest (%s(%s)): -->%s") % (result[1], sargs, - "PASS"if result[0] else "FAIL") + res = "FAIL" + if result[0]: + res = "PASS" + return ("Subtest (%s(%s)): -->%s") % (result[1], sargs,res) def result_to_string(self, result): """ @param result: Result of test. """ - return ("Subtest (%s): -->%s") % (result[1], "PASS"if result[0] - else "FAIL") + res = "FAIL" + if result[0]: + res = "PASS" + return ("Subtest (%s): -->%s") % (result[1], res) def get_full_text_result(self):
Signature · 6 lines
1.7.2.3 _______________________________________________ Autotest mailing list [email protected] http://test.kernel.org/cgi-bin/mailman/listinfo/autotest
Re: [PATCH] Add support for python2.4 virtio_console.
Quoted 1 line · Lukas Doktor
From: Jiří Župka <[email protected]>
I actually made this patch myself on the v2 I sent to the mailing list and applied after it. But thanks anyway :)
Lucas
Quoted 44 lines
--- client/tests/kvm/tests/virtio_console.py | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-)client/tests/kvm/tests/virtio_console.py +11
-5@@ -102,7 +102,9 @@ def run_virtio_console(test, params, env): """ @return: If any of subtest not pass return True. """ - return True if self.failed > 0 else False + if self.failed > 0: + return True + return False def get_result(self): """@@ -121,16 +123,20 @@ def run_virtio_console(test, params, env): for arg in result[2]: sargs += str(arg) + "," sargs = sargs[:-1] - return ("Subtest (%s(%s)): -->%s") % (result[1], sargs, - "PASS"if result[0] else "FAIL") + res = "FAIL" + if result[0]: + res = "PASS" + return ("Subtest (%s(%s)): -->%s") % (result[1], sargs,res) def result_to_string(self, result): """ @param result: Result of test. """ - return ("Subtest (%s): -->%s") % (result[1], "PASS"if result[0] - else "FAIL") + res = "FAIL" + if result[0]: + res = "PASS" + return ("Subtest (%s): -->%s") % (result[1], res) def get_full_text_result(self):