From f1358010f8d6d19209ea916fe195cf8c6ebe8b8e Mon Sep 17 00:00:00 2001
From: Tomas Pecka <tomas.pecka@fit.cvut.cz>
Date: Sat, 5 Oct 2019 12:48:44 +0200
Subject: [PATCH] Integration tests: Slight changes in timeout reporting
---
.../test-src/testing/TimeoutAqlTest.cpp | 11 +++++++----
alib2integrationtest/test-src/tests/dummyTest.cpp | 12 +++++++++++-
2 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/alib2integrationtest/test-src/testing/TimeoutAqlTest.cpp b/alib2integrationtest/test-src/testing/TimeoutAqlTest.cpp
index 9d5abef727..f9d6cf6a80 100644
--- a/alib2integrationtest/test-src/testing/TimeoutAqlTest.cpp
+++ b/alib2integrationtest/test-src/testing/TimeoutAqlTest.cpp
@@ -158,12 +158,15 @@ void _TimeoutAqlTest ( const std::chrono::microseconds & timeout, const ext::vec
INFO ( "Child output was: >" << childOutput << "<" );
REQUIRE ( WEXITSTATUS ( status ) == 0 );
} else if ( WIFSIGNALED ( status ) ) {
- INFO ( "AqlTest failure. Trying to execute: " << formatQueries ( queries ) );
- INFO ( "Seed was: " << seed );
- INFO ( "Child output was: >" << childOutput << "<" );
if ( WTERMSIG ( status ) == SIGTERM || WTERMSIG ( status ) == SIGKILL ) { /* killed by timeout control */
- WARN ( "Timeout (" << timeout.count ( ) << " us) reached in test (" << queries << ")" );
+ WARN ( "AqlTest timeout (" << timeout.count ( ) << " us) reached. Trying to execute:\n" << formatQueries ( queries ) <<
+ "Seed was: " << seed << "\n" <<
+ "Child output was: >" << childOutput << "<" );
+ CHECK_NOFAIL ( "timeout warning" == nullptr );
} else {
+ INFO ( "AqlTest failure. Trying to execute: " << formatQueries ( queries ) );
+ INFO ( "Seed was: " << seed );
+ INFO ( "Child output was: >" << childOutput << "<" );
INFO ( "Child process signaled, signal " << WTERMSIG ( status ) << " (" << strsignal ( WTERMSIG ( status ) ) << ")" );
FAIL ( );
}
diff --git a/alib2integrationtest/test-src/tests/dummyTest.cpp b/alib2integrationtest/test-src/tests/dummyTest.cpp
index 7ae412c131..904c1c956f 100644
--- a/alib2integrationtest/test-src/tests/dummyTest.cpp
+++ b/alib2integrationtest/test-src/tests/dummyTest.cpp
@@ -4,7 +4,7 @@
#include "testing/TimeoutAqlTest.hpp"
#include "testing/TestFiles.hpp"
-TEST_CASE ( "Dummy Test", "[integration][dummy][!mayfail][!hide]" ) {
+TEST_CASE ( "AQL Test", "[integration][dummy][!shouldfail][!hide]" ) {
ext::vector < std::string > qs = {
"execute 1",
"exec"
@@ -22,9 +22,19 @@ TEST_CASE ( "Segfault Test", "[integration][dummy][!shouldfail][!hide]" ) {
TimeoutAqlTest ( 1s, qs );
}
+TEST_CASE ( "Failed Test", "[integration][dummy][!hide][!shouldfail]" ) {
+ ext::vector < std::string > qs = {
+ "quit compare::PrimitiveCompare 1 2",
+ };
+
+ TimeoutAqlTest ( 1s, qs );
+}
+
TEST_CASE ( "Timeout Test", "[integration][dummy][!hide]" ) {
+ // we dont fail the tests (CHECK_NOFAIL) is used, so this is probably useless
ext::vector < std::string > qs = {
"execute \"generated some output\"",
+ "execute \"generated some output for the second time\"",
};
TimeoutAqlTest ( 1us, qs );
--
GitLab