Skip to content

GitLab

Commit a0435a54 authored by Gennadiy Civil's avatar Gennadiy Civil
Browse files

merging

parent 8d707dfe
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
googletest/test/gtest_test_utils.py
View file @ a0435a54
...@@ -28,6 +28,8 @@ ...@@ -28,6 +28,8 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
"""Unit test utilities for Google C++ Testing Framework.""" """Unit test utilities for Google C++ Testing Framework."""
# Suppresses the 'Import not at the top of the file' lint complaint.
# pylint: disable-msg=C6204
__author__ = 'wan@google.com (Zhanyong Wan)' __author__ = 'wan@google.com (Zhanyong Wan)'
...@@ -44,8 +46,6 @@ import tempfile ...@@ -44,8 +46,6 @@ import tempfile
import unittest import unittest
_test_module = unittest _test_module = unittest
# Suppresses the 'Import not at the top of the file' lint complaint.
# pylint: disable-msg=C6204
try: try:
import subprocess import subprocess
_SUBPROCESS_MODULE_AVAILABLE = True _SUBPROCESS_MODULE_AVAILABLE = True
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment