Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Show more detailed messages when running test cases in CI #2148

Merged
merged 6 commits into from
May 8, 2020
Merged

Show more detailed messages when running test cases in CI #2148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
882047d
Show messages when running test cases
abitmore Apr 19, 2020
c7a7e5b
Show more messages when running in Travis
abitmore Apr 19, 2020
431fd68
Merge branch 'develop' into msgs-on-testing
abitmore May 7, 2020
46152ac
Optimize Travis CI build steps
abitmore May 8, 2020
1b0950d
Merge branch 'develop' into msgs-on-testing
abitmore May 8, 2020
9e48083
Improve two-node-network test case
abitmore May 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions .github/workflows/build-and-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@ jobs:
df -h
- name: Unit-Tests
run: |
_build/tests/app_test
_build/tests/es_test
libraries/fc/tests/run-parallel-tests.sh _build/tests/chain_test
libraries/fc/tests/run-parallel-tests.sh _build/tests/cli_test
_build/tests/app_test -l message
_build/tests/es_test -l message
libraries/fc/tests/run-parallel-tests.sh _build/tests/chain_test -l message
libraries/fc/tests/run-parallel-tests.sh _build/tests/cli_test -l message
df -h
- name: Node-Test
run: |
Expand Down Expand Up @@ -146,12 +146,12 @@ jobs:
df -h
- name: Unit-Tests
run: |
_build/tests/app_test
_build/tests/app_test -l message
df -h
_build/tests/es_test
_build/tests/es_test -l message
df -h
libraries/fc/tests/run-parallel-tests.sh _build/tests/chain_test
libraries/fc/tests/run-parallel-tests.sh _build/tests/cli_test
libraries/fc/tests/run-parallel-tests.sh _build/tests/chain_test -l message
libraries/fc/tests/run-parallel-tests.sh _build/tests/cli_test -l message
df -h
- name: Node-Test
run: |
Expand Down Expand Up @@ -336,9 +336,9 @@ jobs:
df -h
- name: Unit-Tests
run: |
_build/tests/app_test
libraries/fc/tests/run-parallel-tests.sh _build/tests/chain_test
libraries/fc/tests/run-parallel-tests.sh _build/tests/cli_test
_build/tests/app_test -l message
libraries/fc/tests/run-parallel-tests.sh _build/tests/chain_test -l message
libraries/fc/tests/run-parallel-tests.sh _build/tests/cli_test -l message
df -h
- name: Node-Test
run: |
Expand Down
6 changes: 3 additions & 3 deletions programs/build_helpers/build_and_test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ programs/build_helpers/buildstep -s 3500
ccache -s
programs/build_helpers/buildstep Prepare 1 "sed -i '/tests/d' libraries/fc/CMakeLists.txt"
programs/build_helpers/buildstep cmake 5 "cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS=--coverage -DCMAKE_CXX_FLAGS=--coverage -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_CXX_OUTPUT_EXTENSION_REPLACE=ON ."
programs/build_helpers/buildstep make.everything 2400 "programs/build_helpers/make_with_sonar bw-output -j 2 witness_node chain_test cli_test"
programs/build_helpers/buildstep make.everything 2400 "programs/build_helpers/make_with_sonar bw-output -j 2 witness_node cli_wallet chain_test cli_test"
set -o pipefail
programs/build_helpers/buildstep run.chain_test 240 "libraries/fc/tests/run-parallel-tests.sh tests/chain_test"
programs/build_helpers/buildstep run.cli_test 60 "libraries/fc/tests/run-parallel-tests.sh tests/cli_test"
programs/build_helpers/buildstep run.chain_test 240 "libraries/fc/tests/run-parallel-tests.sh tests/chain_test -l message"
programs/build_helpers/buildstep run.cli_test 60 "libraries/fc/tests/run-parallel-tests.sh tests/cli_test -l message"
programs/build_helpers/buildstep prepare.sonar 20 "find libraries/[acdenptuw]*/CMakeFiles/*.dir programs/[cdgjsw]*/CMakeFiles/*.dir -type d -print | while read d; do gcov -o \"\$d\" \"\${d/CMakeFiles*.dir//}\"/*.cpp; done >/dev/null; programs/build_helpers/set_sonar_branch sonar-project.properties"
du -hs sonar_cache
# The first pass, skip some files. This will remove the skipped files from the cache, but is an acceptable trade-off
Expand Down
5 changes: 4 additions & 1 deletion programs/build_helpers/scan_with_sonar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,14 @@ programs/build_helpers/buildstep -s 3500
ccache -s
programs/build_helpers/buildstep Prepare 1 "sed -i '/tests/d' libraries/fc/CMakeLists.txt"
programs/build_helpers/buildstep cmake 5 "cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS=--coverage -DCMAKE_CXX_FLAGS=--coverage -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_CXX_OUTPUT_EXTENSION_REPLACE=ON ."
programs/build_helpers/buildstep make.everything 2400 "programs/build_helpers/make_with_sonar bw-output -j 2 witness_node chain_test cli_test"
programs/build_helpers/buildstep make.programs 2400 "programs/build_helpers/make_with_sonar bw-output -j 2 witness_node cli_wallet"
set -o pipefail
programs/build_helpers/buildstep prepare.sonar 20 "find libraries/[acdenptuw]*/CMakeFiles/*.dir programs/[cdgjsw]*/CMakeFiles/*.dir -type d -print | while read d; do gcov -o \"\$d\" \"\${d/CMakeFiles*.dir//}\"/*.cpp; done >/dev/null; programs/build_helpers/set_sonar_branch sonar-project.properties"
du -hs sonar_cache
# The first pass, skip some files. This will remove the skipped files from the cache, but is an acceptable trade-off
# Note: since the first pass was done already in `build_and_test`, ideally we don't need to do it again here.
# However, if we skip this step, the second pass below will come with a very low cache hit, don't know why.
# Anyway, a 100% cache hit is expected for this step, so it's fast and it doesn't matter to do it again.
programs/build_helpers/buildstep prepare.sonar.part 1 "cp sonar-project.properties sonar-project.properties.bak; sed -i '/sonar\.exclusions=/d;s/#sonar\.exclusions.part/sonar.exclusions/' sonar-project.properties"
programs/build_helpers/buildstep run.sonar.part 1500 "which sonar-scanner && sonar-scanner"
programs/build_helpers/buildstep prepare.sonar.full 1 "cp sonar-project.properties.bak sonar-project.properties"
Expand Down
13 changes: 4 additions & 9 deletions tests/app/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,11 +246,11 @@ BOOST_AUTO_TEST_CASE( two_node_network )
BOOST_TEST_MESSAGE( "Starting app1 and waiting 500 ms" );
app1.startup();
#ifdef NDEBUG
#define LISTEN_WAIT_TIME (fc::milliseconds(30000))
#define NODE_STARTUP_WAIT_TIME (fc::milliseconds(30000))
#else
#define LISTEN_WAIT_TIME (fc::milliseconds(120000))
#define NODE_STARTUP_WAIT_TIME (fc::milliseconds(120000))
#endif
fc::wait_for( LISTEN_WAIT_TIME, [&app1] () {
fc::wait_for( NODE_STARTUP_WAIT_TIME, [&app1] () {
const auto status = app1.p2p_node()->network_get_info();
return status["listening_on"].as<fc::ip::endpoint>( 5 ).port() == 3939;
});
Expand All @@ -273,12 +273,7 @@ BOOST_AUTO_TEST_CASE( two_node_network )
BOOST_TEST_MESSAGE( "Starting app2 and waiting for connection" );
app2.startup();

#ifdef NDEBUG
#define CONNECT_WAIT_TIME (fc::milliseconds(10000))
#else
#define CONNECT_WAIT_TIME (fc::milliseconds(30000))
#endif
fc::wait_for( CONNECT_WAIT_TIME, [&app1] () { return app1.p2p_node()->get_connection_count() > 0; } );
fc::wait_for( NODE_STARTUP_WAIT_TIME, [&app1] () { return app1.p2p_node()->get_connection_count() > 0; } );

BOOST_REQUIRE_EQUAL(app1.p2p_node()->get_connection_count(), 1u);
BOOST_CHECK_EQUAL(std::string(app1.p2p_node()->get_connected_peers().front().host.get_address()), "127.0.0.1");
Expand Down