From d8f1dbdeb7d0f3ce9d14c27c4aa460c6a5916da4 Mon Sep 17 00:00:00 2001 From: Ewen Cheslack-Postava Date: Fri, 31 Oct 2014 11:39:38 -0700 Subject: [PATCH 1/3] KAFKA-1746 Make unexpected exceptions during tests mark the test as failed. --- system_test/mirror_maker_testsuite/mirror_maker_test.py | 1 + system_test/offset_management_testsuite/offset_management_test.py | 1 + system_test/replication_testsuite/replica_basic_test.py | 2 ++ 3 files changed, 4 insertions(+) diff --git a/system_test/mirror_maker_testsuite/mirror_maker_test.py b/system_test/mirror_maker_testsuite/mirror_maker_test.py index c0117c6..48f9ff6 100644 --- a/system_test/mirror_maker_testsuite/mirror_maker_test.py +++ b/system_test/mirror_maker_testsuite/mirror_maker_test.py @@ -315,6 +315,7 @@ class MirrorMakerTest(ReplicationUtils, SetupUtils): except Exception as e: self.log_message("Exception while running test {0}".format(e)) traceback.print_exc() + self.testcaseEnv.validationStatusDict["Test completed"] = "FAILED" finally: if not skipThisTestCase and not self.systemTestEnv.printTestDescriptionsOnly: diff --git a/system_test/offset_management_testsuite/offset_management_test.py b/system_test/offset_management_testsuite/offset_management_test.py index 12b5cd2..aa38910 100644 --- a/system_test/offset_management_testsuite/offset_management_test.py +++ b/system_test/offset_management_testsuite/offset_management_test.py @@ -290,6 +290,7 @@ class OffsetManagementTest(ReplicationUtils, SetupUtils): except Exception as e: self.log_message("Exception while running test {0}".format(e)) traceback.print_exc() + self.testcaseEnv.validationStatusDict["Test completed"] = "FAILED" finally: if not skipThisTestCase and not self.systemTestEnv.printTestDescriptionsOnly: diff --git a/system_test/replication_testsuite/replica_basic_test.py b/system_test/replication_testsuite/replica_basic_test.py index 660006c..16a24a4 100644 --- a/system_test/replication_testsuite/replica_basic_test.py +++ b/system_test/replication_testsuite/replica_basic_test.py @@ -451,6 +451,8 @@ class ReplicaBasicTest(ReplicationUtils, SetupUtils): except Exception as e: self.log_message("Exception while running test {0}".format(e)) traceback.print_exc() + self.testcaseEnv.validationStatusDict["Test completed"] = "FAILED" + finally: if not skipThisTestCase and not self.systemTestEnv.printTestDescriptionsOnly: -- 2.1.2 From d28081507b9e8a09ea1b2a061f484a6ffe1298dd Mon Sep 17 00:00:00 2001 From: Ewen Cheslack-Postava Date: Fri, 31 Oct 2014 11:57:55 -0700 Subject: [PATCH 2/3] KAFKA-1746 Make system tests return a useful exit code. --- system_test/system_test_runner.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system_test/system_test_runner.py b/system_test/system_test_runner.py index ee7aa25..5078d44 100644 --- a/system_test/system_test_runner.py +++ b/system_test/system_test_runner.py @@ -199,6 +199,6 @@ def main(): # main entry point # ========================= -main() +sys.exit(main()) -- 2.1.2 From fbb902bc8b05e02e2761224f471b6d02ce326438 Mon Sep 17 00:00:00 2001 From: Ewen Cheslack-Postava Date: Fri, 31 Oct 2014 12:18:15 -0700 Subject: [PATCH 3/3] KAFKA-1746 Check the exit code when running DumpLogSegments to verify data. --- system_test/utils/kafka_system_test_utils.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/system_test/utils/kafka_system_test_utils.py b/system_test/utils/kafka_system_test_utils.py index 1093b66..41d511c 100644 --- a/system_test/utils/kafka_system_test_utils.py +++ b/system_test/utils/kafka_system_test_utils.py @@ -2400,6 +2400,9 @@ def validate_index_log(systemTestEnv, testcaseEnv, clusterName="source"): logger.debug("#### error found [" + line + "]", extra=d) failureCount += 1 showMismatchedIndexOffset = True + if subproc.wait() != 0: + logger.debug("#### error found [DumpLogSegments exited abnormally]", extra=d) + failureCount += 1 if failureCount == 0: validationStatusDict["Validate index log in cluster [" + clusterName + "]"] = "PASSED" -- 2.1.2