X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fbaddr-statedump%2Ftest_baddr-statedump.py;h=53f9dedd844ca0581a490b7209ac7b7965263197;hb=b6e2447a0a8d7fcd62c9c592082f5543eb10ade4;hp=47ed9d6156b5a61a16e7b2f9730859aa1cb44e49;hpb=65385a822c061a32c9059caac52f1a69bd06795b;p=lttng-tools.git diff --git a/tests/regression/ust/baddr-statedump/test_baddr-statedump.py b/tests/regression/ust/baddr-statedump/test_baddr-statedump.py index 47ed9d615..53f9dedd8 100644 --- a/tests/regression/ust/baddr-statedump/test_baddr-statedump.py +++ b/tests/regression/ust/baddr-statedump/test_baddr-statedump.py @@ -46,14 +46,7 @@ enable_ust_tracepoint_event(session_info, "*") start_session(session_info) test_process = subprocess.Popen(test_path + "prog.strip", stdout=subprocess.PIPE, stderr=subprocess.PIPE) -if sys.version_info >= (3, 3): - try: - test_process.wait(5) - except subprocess.TimeoutExpired: - test_process.kill() - bail("Failed to run ust baddr-statedump test application.", session_info) -else: - test_process.wait() +test_process.wait() print_test_result(test_process.returncode == 0, current_test, "Test application exited normally") current_test += 1 @@ -67,22 +60,22 @@ except FileNotFoundError: bail("Could not open babeltrace. Please make sure it is installed.", session_info) start_event_found = False -soinfo_event_found = False +bin_info_event_found = False build_id_event_found = False debug_link_event_found = False end_event_found = False for event_line in babeltrace_process.stdout: # Let babeltrace finish to get the return code - if start_event_found and soinfo_event_found and build_id_event_found and \ + if start_event_found and bin_info_event_found and build_id_event_found and \ debug_link_event_found and end_event_found: continue event_line = event_line.decode('utf-8').replace("\n", "") if re.search(r".*lttng_ust_statedump:start.*", event_line) is not None: start_event_found = True - elif re.search(r".*lttng_ust_statedump:soinfo.*", event_line) is not None: - soinfo_event_found = True + elif re.search(r".*lttng_ust_statedump:bin_info.*", event_line) is not None: + bin_info_event_found = True elif re.search(r".*lttng_ust_statedump:build_id.*", event_line) is not None: build_id_event_found = True elif re.search(r".*lttng_ust_statedump:debug_link.*", event_line) is not None: @@ -98,7 +91,7 @@ current_test += 1 print_test_result(start_event_found, current_test, "lttng_ust_statedump:start event found in resulting trace") current_test += 1 -print_test_result(soinfo_event_found, current_test, "lttng_ust_statedump:soinfo event found in resulting trace") +print_test_result(bin_info_event_found, current_test, "lttng_ust_statedump:bin_info event found in resulting trace") current_test += 1 print_test_result(build_id_event_found, current_test, "lttng_ust_statedump:build_id event found in resulting trace")