From patchwork Tue Sep 29 20:04:26 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Goldish X-Patchwork-Id: 50592 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n8TK8HX2029650 for ; Tue, 29 Sep 2009 20:08:17 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753762AbZI2UIJ (ORCPT ); Tue, 29 Sep 2009 16:08:09 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752068AbZI2UIH (ORCPT ); Tue, 29 Sep 2009 16:08:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57757 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753762AbZI2UIE (ORCPT ); Tue, 29 Sep 2009 16:08:04 -0400 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8TK88F7022454; Tue, 29 Sep 2009 16:08:08 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8TK871t023280; Tue, 29 Sep 2009 16:08:07 -0400 Received: from localhost.localdomain (dhcp-1-188.tlv.redhat.com [10.35.1.188]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n8TK80NZ003847; Tue, 29 Sep 2009 16:08:06 -0400 From: Michael Goldish To: autotest@test.kernel.org, kvm@vger.kernel.org Cc: Michael Goldish Subject: [KVM-AUTOTEST PATCH 5/6] KVM test: tests/steps.py: simplify barrier_2() Date: Tue, 29 Sep 2009 22:04:26 +0200 Message-Id: <1254254667-19385-5-git-send-email-mgoldish@redhat.com> In-Reply-To: <1254254667-19385-4-git-send-email-mgoldish@redhat.com> References: <1254254667-19385-1-git-send-email-mgoldish@redhat.com> <1254254667-19385-2-git-send-email-mgoldish@redhat.com> <1254254667-19385-3-git-send-email-mgoldish@redhat.com> <1254254667-19385-4-git-send-email-mgoldish@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org diff --git a/client/tests/kvm/tests/steps.py b/client/tests/kvm/tests/steps.py index d0b7dbd..11b2ae1 100644 --- a/client/tests/kvm/tests/steps.py +++ b/client/tests/kvm/tests/steps.py @@ -30,22 +30,27 @@ def barrier_2(vm, words, params, debug_dir, data_scrdump_filename, logging.error("Bad barrier_2 command line") return False + # Parse barrier command line cmd, dx, dy, x1, y1, md5sum, timeout = words[:7] dx, dy, x1, y1, timeout = map(int, [dx, dy, x1, y1, timeout]) + # Define some paths scrdump_filename = os.path.join(debug_dir, "scrdump.ppm") cropped_scrdump_filename = os.path.join(debug_dir, "cropped_scrdump.ppm") expected_scrdump_filename = os.path.join(debug_dir, "scrdump_expected.ppm") expected_cropped_scrdump_filename = os.path.join(debug_dir, "cropped_scrdump_expected.ppm") comparison_filename = os.path.join(debug_dir, "comparison.ppm") + history_dir = os.path.join(debug_dir, "barrier_history") + + # Collect a few parameters + timeout_multiplier = float(params.get("timeout_multiplier") or 1) + fail_if_stuck_for = float(params.get("fail_if_stuck_for") or 1e308) + stuck_detection_history = int(params.get("stuck_detection_history") or 2) + keep_screendump_history = params.get("keep_screendump_history") == "yes" + keep_all_history = params.get("keep_all_history") == "yes" # Multiply timeout by the timeout multiplier - timeout_multiplier = params.get("timeout_multiplier") - if timeout_multiplier: - timeout_multiplier = float(timeout_multiplier) - else: - timeout_multiplier = 1.0 timeout *= timeout_multiplier # Timeout/5 is the time it took stepmaker to complete this step. @@ -56,23 +61,6 @@ def barrier_2(vm, words, params, debug_dir, data_scrdump_filename, if sleep_duration < 1.0: sleep_duration = 1.0 if sleep_duration > 10.0: sleep_duration = 10.0 - fail_if_stuck_for = params.get("fail_if_stuck_for") - if fail_if_stuck_for: - fail_if_stuck_for = float(fail_if_stuck_for) - else: - fail_if_stuck_for = 1e308 - - stuck_detection_history = params.get("stuck_detection_history") - if stuck_detection_history: - stuck_detection_history = int(stuck_detection_history) - else: - stuck_detection_history = 2 - - keep_screendump_history = params.get("keep_screendump_history") == "yes" - if keep_screendump_history: - keep_all_history = params.get("keep_all_history") == "yes" - history_dir = os.path.join(debug_dir, "barrier_history") - end_time = time.time() + timeout end_time_stuck = time.time() + fail_if_stuck_for start_time = time.time()