From 6ec1ac8c9da6c436067bb51e73c9aaaa96858ab7 Mon Sep 17 00:00:00 2001 From: jmecosta Date: Sat, 2 Jan 2016 13:05:16 +0200 Subject: [PATCH 1/5] #721 delay it --- integration-tests/features/steps/test_execution_statistics.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/integration-tests/features/steps/test_execution_statistics.py b/integration-tests/features/steps/test_execution_statistics.py index fa72b9286d..0d422206f5 100644 --- a/integration-tests/features/steps/test_execution_statistics.py +++ b/integration-tests/features/steps/test_execution_statistics.py @@ -26,6 +26,7 @@ from requests.auth import HTTPBasicAuth import subprocess import shutil +import time from behave import given, when, then, model from common import analyselog, build_regexp, sonarlog, analyseloglines @@ -112,6 +113,7 @@ def step_impl(context, command): @then(u'the analysis finishes successfully') def step_impl(context): + time.sleep(60) # delays for 60 seconds assert context.rc == 0, "Exit code is %i, but should be zero" % context.rc From b55dc2dea932752ffc02ba22f8ed1743d8e54cbf Mon Sep 17 00:00:00 2001 From: jmecosta Date: Sat, 2 Jan 2016 13:15:00 +0200 Subject: [PATCH 2/5] tab for spaces --- integration-tests/features/steps/test_execution_statistics.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/integration-tests/features/steps/test_execution_statistics.py b/integration-tests/features/steps/test_execution_statistics.py index 0d422206f5..9034dd26f0 100644 --- a/integration-tests/features/steps/test_execution_statistics.py +++ b/integration-tests/features/steps/test_execution_statistics.py @@ -113,7 +113,8 @@ def step_impl(context, command): @then(u'the analysis finishes successfully') def step_impl(context): - time.sleep(60) # delays for 60 seconds + # delays for 60 seconds + time.sleep(60) assert context.rc == 0, "Exit code is %i, but should be zero" % context.rc From 25c25d4d64f839805eec42e14c92cd240ede8b3a Mon Sep 17 00:00:00 2001 From: jmecosta Date: Sat, 2 Jan 2016 15:40:06 +0200 Subject: [PATCH 3/5] #721 update its as per 5.2 changes --- integration-tests/features/multimodule_analysis.feature | 1 - integration-tests/features/smoketest.feature | 4 ---- .../features/test_create_rules_and_bullseye_import.feature | 4 ---- .../features/test_execution_statistics.feature | 7 ------- 4 files changed, 16 deletions(-) diff --git a/integration-tests/features/multimodule_analysis.feature b/integration-tests/features/multimodule_analysis.feature index deb3604d0c..0d9ce4812c 100644 --- a/integration-tests/features/multimodule_analysis.feature +++ b/integration-tests/features/multimodule_analysis.feature @@ -47,7 +47,6 @@ Feature: cpp-multimodule-project # violations | violations | 28 | # test execution statistics - | test_success_density | 33.3 | | test_failures | 2 | | skipped_tests | 1 | | test_errors | 0 | diff --git a/integration-tests/features/smoketest.feature b/integration-tests/features/smoketest.feature index 75efddf8d3..568fcfa169 100644 --- a/integration-tests/features/smoketest.feature +++ b/integration-tests/features/smoketest.feature @@ -51,11 +51,7 @@ Feature: Smoketest | overall_coverage | 41.2 | | overall_line_coverage | 39.5 | | overall_branch_coverage | 50 | - # design/tangles - | package_tangle_index | 66.7 | - | package_tangles | 1 | # test execution statistics - | test_success_density | 50 | | test_failures | 2 | | test_errors | 0 | | tests | 4 | diff --git a/integration-tests/features/test_create_rules_and_bullseye_import.feature b/integration-tests/features/test_create_rules_and_bullseye_import.feature index 581b67f217..e8ca857c0c 100644 --- a/integration-tests/features/test_create_rules_and_bullseye_import.feature +++ b/integration-tests/features/test_create_rules_and_bullseye_import.feature @@ -53,11 +53,7 @@ Feature: GoogleTestWithBullseyeAndVsProject | coverage | 88.9 | | line_coverage | 100 | | branch_coverage | 50 | - # design/tangles - | package_tangle_index | 0 | - | package_tangles | 0 | # test execution statistics - | test_success_density | 50 | | test_failures | 1 | | test_errors | 0 | | tests | 2 | diff --git a/integration-tests/features/test_execution_statistics.feature b/integration-tests/features/test_execution_statistics.feature index 6aef21cd10..022369c1f5 100644 --- a/integration-tests/features/test_execution_statistics.feature +++ b/integration-tests/features/test_execution_statistics.feature @@ -69,7 +69,6 @@ Feature: Providing test execution numbers | test_failures | 0 | | test_errors | 0 | | skipped_tests | 0 | - | test_success_density | 100 | | test_execution_time | 0 | @@ -169,7 +168,6 @@ Feature: Providing test execution numbers | test_failures | 0 | | test_errors | 0 | | skipped_tests | 0 | - | test_success_density | 100 | | test_execution_time | 0 | Examples: @@ -197,7 +195,6 @@ Feature: Providing test execution numbers | test_failures | None | | test_errors | None | | skipped_tests | None | - | test_success_density | None | | test_execution_time | None | Examples: @@ -242,7 +239,6 @@ Feature: Providing test execution numbers | test_failures | 0 | | test_errors | 0 | | skipped_tests | 0 | - | test_success_density | 100 | | test_execution_time | 0 | @@ -267,7 +263,6 @@ Feature: Providing test execution numbers | test_failures | 0 | | test_errors | 4 | | skipped_tests | 0 | - | test_success_density | 0 | | test_execution_time | 3 | @@ -293,7 +288,6 @@ Feature: Providing test execution numbers | test_failures | 0 | | test_errors | 4 | | skipped_tests | 0 | - | test_success_density | 0 | | test_execution_time | 3 | @@ -383,5 +377,4 @@ Feature: Providing test execution numbers | test_failures | 0 | | test_errors | 4 | | skipped_tests | 0 | - | test_success_density | 0 | | test_execution_time | 3 | From 24748a6d990deff2dedb47a1918d38c5984c7a42 Mon Sep 17 00:00:00 2001 From: jmecosta Date: Sat, 2 Jan 2016 17:27:11 +0200 Subject: [PATCH 4/5] Revert "#721 update its as per 5.2 changes" This reverts commit 25c25d4d64f839805eec42e14c92cd240ede8b3a. --- integration-tests/features/multimodule_analysis.feature | 1 + integration-tests/features/smoketest.feature | 4 ++++ .../features/test_create_rules_and_bullseye_import.feature | 4 ++++ .../features/test_execution_statistics.feature | 7 +++++++ 4 files changed, 16 insertions(+) diff --git a/integration-tests/features/multimodule_analysis.feature b/integration-tests/features/multimodule_analysis.feature index 0d9ce4812c..deb3604d0c 100644 --- a/integration-tests/features/multimodule_analysis.feature +++ b/integration-tests/features/multimodule_analysis.feature @@ -47,6 +47,7 @@ Feature: cpp-multimodule-project # violations | violations | 28 | # test execution statistics + | test_success_density | 33.3 | | test_failures | 2 | | skipped_tests | 1 | | test_errors | 0 | diff --git a/integration-tests/features/smoketest.feature b/integration-tests/features/smoketest.feature index 568fcfa169..75efddf8d3 100644 --- a/integration-tests/features/smoketest.feature +++ b/integration-tests/features/smoketest.feature @@ -51,7 +51,11 @@ Feature: Smoketest | overall_coverage | 41.2 | | overall_line_coverage | 39.5 | | overall_branch_coverage | 50 | + # design/tangles + | package_tangle_index | 66.7 | + | package_tangles | 1 | # test execution statistics + | test_success_density | 50 | | test_failures | 2 | | test_errors | 0 | | tests | 4 | diff --git a/integration-tests/features/test_create_rules_and_bullseye_import.feature b/integration-tests/features/test_create_rules_and_bullseye_import.feature index e8ca857c0c..581b67f217 100644 --- a/integration-tests/features/test_create_rules_and_bullseye_import.feature +++ b/integration-tests/features/test_create_rules_and_bullseye_import.feature @@ -53,7 +53,11 @@ Feature: GoogleTestWithBullseyeAndVsProject | coverage | 88.9 | | line_coverage | 100 | | branch_coverage | 50 | + # design/tangles + | package_tangle_index | 0 | + | package_tangles | 0 | # test execution statistics + | test_success_density | 50 | | test_failures | 1 | | test_errors | 0 | | tests | 2 | diff --git a/integration-tests/features/test_execution_statistics.feature b/integration-tests/features/test_execution_statistics.feature index 022369c1f5..6aef21cd10 100644 --- a/integration-tests/features/test_execution_statistics.feature +++ b/integration-tests/features/test_execution_statistics.feature @@ -69,6 +69,7 @@ Feature: Providing test execution numbers | test_failures | 0 | | test_errors | 0 | | skipped_tests | 0 | + | test_success_density | 100 | | test_execution_time | 0 | @@ -168,6 +169,7 @@ Feature: Providing test execution numbers | test_failures | 0 | | test_errors | 0 | | skipped_tests | 0 | + | test_success_density | 100 | | test_execution_time | 0 | Examples: @@ -195,6 +197,7 @@ Feature: Providing test execution numbers | test_failures | None | | test_errors | None | | skipped_tests | None | + | test_success_density | None | | test_execution_time | None | Examples: @@ -239,6 +242,7 @@ Feature: Providing test execution numbers | test_failures | 0 | | test_errors | 0 | | skipped_tests | 0 | + | test_success_density | 100 | | test_execution_time | 0 | @@ -263,6 +267,7 @@ Feature: Providing test execution numbers | test_failures | 0 | | test_errors | 4 | | skipped_tests | 0 | + | test_success_density | 0 | | test_execution_time | 3 | @@ -288,6 +293,7 @@ Feature: Providing test execution numbers | test_failures | 0 | | test_errors | 4 | | skipped_tests | 0 | + | test_success_density | 0 | | test_execution_time | 3 | @@ -377,4 +383,5 @@ Feature: Providing test execution numbers | test_failures | 0 | | test_errors | 4 | | skipped_tests | 0 | + | test_success_density | 0 | | test_execution_time | 3 | From 1cdb7741c0e3030681e76495ebb2ab41f78ad09a Mon Sep 17 00:00:00 2001 From: jmecosta Date: Sat, 2 Jan 2016 17:29:14 +0200 Subject: [PATCH 5/5] deprecate measures --- integration-tests/features/smoketest.feature | 3 --- .../features/test_create_rules_and_bullseye_import.feature | 3 --- 2 files changed, 6 deletions(-) diff --git a/integration-tests/features/smoketest.feature b/integration-tests/features/smoketest.feature index 75efddf8d3..d55040d846 100644 --- a/integration-tests/features/smoketest.feature +++ b/integration-tests/features/smoketest.feature @@ -51,9 +51,6 @@ Feature: Smoketest | overall_coverage | 41.2 | | overall_line_coverage | 39.5 | | overall_branch_coverage | 50 | - # design/tangles - | package_tangle_index | 66.7 | - | package_tangles | 1 | # test execution statistics | test_success_density | 50 | | test_failures | 2 | diff --git a/integration-tests/features/test_create_rules_and_bullseye_import.feature b/integration-tests/features/test_create_rules_and_bullseye_import.feature index 581b67f217..c8bc1fb2f5 100644 --- a/integration-tests/features/test_create_rules_and_bullseye_import.feature +++ b/integration-tests/features/test_create_rules_and_bullseye_import.feature @@ -53,9 +53,6 @@ Feature: GoogleTestWithBullseyeAndVsProject | coverage | 88.9 | | line_coverage | 100 | | branch_coverage | 50 | - # design/tangles - | package_tangle_index | 0 | - | package_tangles | 0 | # test execution statistics | test_success_density | 50 | | test_failures | 1 |