mirror of
https://github.com/google/googletest.git
synced 2025-03-20 10:53:47 +00:00
Googletest export
Explicitly skip tests after fatal global environment setup errors Previously the tests were all skipped, but the resulting output claimed all tests passed. Before: ``` [----------] Global test environment set-up. <failure message> [----------] Global test environment tear-down [==========] 1 test from 1 test suite ran. (83 ms total) [ PASSED ] 1 test. [ FAILED ] 0 tests, listed below: ``` After: ``` [==========] Running 1 test from 1 test suite. [----------] Global test environment set-up. <failure message> [----------] 1 test from SomeTest [ RUN ] SomeTest.DoesFoo <...>: Skipped [ SKIPPED ] SomeTest.DoesFoo (0 ms) [----------] 1 test from SomeTest (0 ms total) [----------] Global test environment tear-down [==========] 1 test from 1 test suite ran. (68 ms total) [ PASSED ] 0 tests. [ SKIPPED ] 1 test, listed below: [ SKIPPED ] SomeTest.DoesFoo [ FAILED ] 0 tests, listed below: ``` PiperOrigin-RevId: 358026389
This commit is contained in:
parent
7fb047bca3
commit
daa0df7b41
@ -5714,6 +5714,14 @@ bool UnitTestImpl::RunAllTests() {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else if (Test::HasFatalFailure()) {
|
||||||
|
// If there was a fatal failure during the global setup then we know we
|
||||||
|
// aren't going to run any tests. Explicitly mark all of the tests as
|
||||||
|
// skipped to make this obvious in the output.
|
||||||
|
for (int test_index = 0; test_index < total_test_suite_count();
|
||||||
|
test_index++) {
|
||||||
|
GetMutableSuiteCase(test_index)->Skip();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Tears down all environments in reverse order afterwards.
|
// Tears down all environments in reverse order afterwards.
|
||||||
|
@ -62,6 +62,7 @@ cc_test(
|
|||||||
"googletest-env-var-test_.cc",
|
"googletest-env-var-test_.cc",
|
||||||
"googletest-failfast-unittest_.cc",
|
"googletest-failfast-unittest_.cc",
|
||||||
"googletest-filter-unittest_.cc",
|
"googletest-filter-unittest_.cc",
|
||||||
|
"googletest-global-environment-unittest_.cc",
|
||||||
"googletest-break-on-failure-unittest_.cc",
|
"googletest-break-on-failure-unittest_.cc",
|
||||||
"googletest-listener-test.cc",
|
"googletest-listener-test.cc",
|
||||||
"googletest-output-test_.cc",
|
"googletest-output-test_.cc",
|
||||||
@ -256,6 +257,21 @@ py_test(
|
|||||||
deps = [":gtest_test_utils"],
|
deps = [":gtest_test_utils"],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
cc_binary(
|
||||||
|
name = "googletest-global-environment-unittest_",
|
||||||
|
testonly = 1,
|
||||||
|
srcs = ["googletest-global-environment-unittest_.cc"],
|
||||||
|
deps = ["//:gtest"],
|
||||||
|
)
|
||||||
|
|
||||||
|
py_test(
|
||||||
|
name = "googletest-global-environment-unittest",
|
||||||
|
size = "medium",
|
||||||
|
srcs = ["googletest-global-environment-unittest.py"],
|
||||||
|
data = [":googletest-global-environment-unittest_"],
|
||||||
|
deps = [":gtest_test_utils"],
|
||||||
|
)
|
||||||
|
|
||||||
cc_binary(
|
cc_binary(
|
||||||
name = "googletest-break-on-failure-unittest_",
|
name = "googletest-break-on-failure-unittest_",
|
||||||
testonly = 1,
|
testonly = 1,
|
||||||
@ -551,11 +567,11 @@ py_test(
|
|||||||
size = "small",
|
size = "small",
|
||||||
srcs = ["googletest-param-test-invalid-name1-test.py"],
|
srcs = ["googletest-param-test-invalid-name1-test.py"],
|
||||||
data = [":googletest-param-test-invalid-name1-test_"],
|
data = [":googletest-param-test-invalid-name1-test_"],
|
||||||
deps = [":gtest_test_utils"],
|
|
||||||
tags = [
|
tags = [
|
||||||
"no_test_msvc2015",
|
"no_test_msvc2015",
|
||||||
"no_test_msvc2017",
|
"no_test_msvc2017",
|
||||||
],
|
],
|
||||||
|
deps = [":gtest_test_utils"],
|
||||||
)
|
)
|
||||||
|
|
||||||
py_test(
|
py_test(
|
||||||
@ -563,9 +579,9 @@ py_test(
|
|||||||
size = "small",
|
size = "small",
|
||||||
srcs = ["googletest-param-test-invalid-name2-test.py"],
|
srcs = ["googletest-param-test-invalid-name2-test.py"],
|
||||||
data = [":googletest-param-test-invalid-name2-test_"],
|
data = [":googletest-param-test-invalid-name2-test_"],
|
||||||
deps = [":gtest_test_utils"],
|
|
||||||
tags = [
|
tags = [
|
||||||
"no_test_msvc2015",
|
"no_test_msvc2015",
|
||||||
"no_test_msvc2017",
|
"no_test_msvc2017",
|
||||||
],
|
],
|
||||||
|
deps = [":gtest_test_utils"],
|
||||||
)
|
)
|
||||||
|
72
googletest/test/googletest-global-environment-unittest.py
Normal file
72
googletest/test/googletest-global-environment-unittest.py
Normal file
@ -0,0 +1,72 @@
|
|||||||
|
# Copyright 2021 Google Inc. All Rights Reserved.
|
||||||
|
#
|
||||||
|
# Redistribution and use in source and binary forms, with or without
|
||||||
|
# modification, are permitted provided that the following conditions are
|
||||||
|
# met:
|
||||||
|
#
|
||||||
|
# * Redistributions of source code must retain the above copyright
|
||||||
|
# notice, this list of conditions and the following disclaimer.
|
||||||
|
# * Redistributions in binary form must reproduce the above
|
||||||
|
# copyright notice, this list of conditions and the following disclaimer
|
||||||
|
# in the documentation and/or other materials provided with the
|
||||||
|
# distribution.
|
||||||
|
# * Neither the name of Google Inc. nor the names of its
|
||||||
|
# contributors may be used to endorse or promote products derived from
|
||||||
|
# this software without specific prior written permission.
|
||||||
|
#
|
||||||
|
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||||
|
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||||
|
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||||
|
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||||
|
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||||
|
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||||
|
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||||
|
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||||
|
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
|
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
"""Unit test for Google Test's global test environment behavior.
|
||||||
|
|
||||||
|
A user can specify a global test environment via
|
||||||
|
testing::AddGlobalTestEnvironment. Failures in the global environment should
|
||||||
|
result in all unit tests being skipped.
|
||||||
|
|
||||||
|
This script tests such functionality by invoking
|
||||||
|
googletest-global-environment-unittest_ (a program written with Google Test).
|
||||||
|
"""
|
||||||
|
|
||||||
|
import gtest_test_utils
|
||||||
|
|
||||||
|
|
||||||
|
def RunAndReturnOutput():
|
||||||
|
"""Runs the test program and returns its output."""
|
||||||
|
|
||||||
|
return gtest_test_utils.Subprocess([
|
||||||
|
gtest_test_utils.GetTestExecutablePath(
|
||||||
|
'googletest-global-environment-unittest_')
|
||||||
|
]).output
|
||||||
|
|
||||||
|
|
||||||
|
class GTestGlobalEnvironmentUnitTest(gtest_test_utils.TestCase):
|
||||||
|
"""Tests global test environment failures."""
|
||||||
|
|
||||||
|
def testEnvironmentSetUpFails(self):
|
||||||
|
"""Tests the behavior of not specifying the fail_fast."""
|
||||||
|
|
||||||
|
# Run the test.
|
||||||
|
txt = RunAndReturnOutput()
|
||||||
|
|
||||||
|
# We should see the text of the global environment setup error.
|
||||||
|
self.assertIn('Canned environment setup error', txt)
|
||||||
|
|
||||||
|
# Our test should have been skipped due to the error, and not treated as a
|
||||||
|
# pass.
|
||||||
|
self.assertIn('[ SKIPPED ] 1 test', txt)
|
||||||
|
self.assertIn('[ PASSED ] 0 tests', txt)
|
||||||
|
|
||||||
|
# The test case shouldn't have been run.
|
||||||
|
self.assertNotIn('Unexpected call', txt)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
gtest_test_utils.Main()
|
58
googletest/test/googletest-global-environment-unittest_.cc
Normal file
58
googletest/test/googletest-global-environment-unittest_.cc
Normal file
@ -0,0 +1,58 @@
|
|||||||
|
// Copyright 2005, Google Inc.
|
||||||
|
// All rights reserved.
|
||||||
|
//
|
||||||
|
// Redistribution and use in source and binary forms, with or without
|
||||||
|
// modification, are permitted provided that the following conditions are
|
||||||
|
// met:
|
||||||
|
//
|
||||||
|
// * Redistributions of source code must retain the above copyright
|
||||||
|
// notice, this list of conditions and the following disclaimer.
|
||||||
|
// * Redistributions in binary form must reproduce the above
|
||||||
|
// copyright notice, this list of conditions and the following disclaimer
|
||||||
|
// in the documentation and/or other materials provided with the
|
||||||
|
// distribution.
|
||||||
|
// * Neither the name of Google Inc. nor the names of its
|
||||||
|
// contributors may be used to endorse or promote products derived from
|
||||||
|
// this software without specific prior written permission.
|
||||||
|
//
|
||||||
|
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||||
|
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||||
|
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||||
|
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||||
|
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||||
|
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||||
|
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||||
|
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||||
|
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
|
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
|
// Unit test for Google Test global test environments.
|
||||||
|
//
|
||||||
|
// The program will be invoked from a Python unit test. Don't run it
|
||||||
|
// directly.
|
||||||
|
|
||||||
|
#include "gtest/gtest.h"
|
||||||
|
|
||||||
|
namespace {
|
||||||
|
|
||||||
|
// An environment that always fails in its SetUp method.
|
||||||
|
class FailingEnvironment final : public ::testing::Environment {
|
||||||
|
public:
|
||||||
|
void SetUp() override { FAIL() << "Canned environment setup error"; }
|
||||||
|
};
|
||||||
|
|
||||||
|
// Register the environment.
|
||||||
|
auto* const g_environment_ =
|
||||||
|
::testing::AddGlobalTestEnvironment(new FailingEnvironment);
|
||||||
|
|
||||||
|
// A test that doesn't actually run.
|
||||||
|
TEST(SomeTest, DoesFoo) { FAIL() << "Unexpected call"; }
|
||||||
|
|
||||||
|
} // namespace
|
||||||
|
|
||||||
|
int main(int argc, char** argv) {
|
||||||
|
::testing::InitGoogleTest(&argc, argv);
|
||||||
|
|
||||||
|
return RUN_ALL_TESTS();
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user