Fix some lint errors.
The test helper change is for a test that will be released in a future version.
PiperOrigin-RevId: 435099266
Change-Id: I870a7a6386f5ecca4e349b1211b92c723dfd8c54
diff --git a/absl/logging/tests/logging_functional_test.py b/absl/logging/tests/logging_functional_test.py
index faa0de4..98a2fab 100644
--- a/absl/logging/tests/logging_functional_test.py
+++ b/absl/logging/tests/logging_functional_test.py
@@ -324,6 +324,7 @@
pass_logtostderr=False,
use_absl_log_file=False,
show_info_prefix=1,
+ call_dict_config=False,
extra_args=()):
"""Execute the helper script and verify its output.
@@ -343,6 +344,8 @@
logging.get_absl_handler().use_absl_log_file() before test_fn in
logging_functional_test_helper.
show_info_prefix: --showprefixforinfo value passed to the helper script.
+ call_dict_config: True if helper script should call
+ logging.config.dictConfig.
extra_args: Iterable of str (optional, defaults to ()) - extra arguments
to pass to the helper script.
@@ -361,6 +364,7 @@
env.update({
'TEST_NAME': test_name,
'USE_ABSL_LOG_FILE': '%d' % (use_absl_log_file,),
+ 'CALL_DICT_CONFIG': '%d' % (call_dict_config,),
})
cmd = [self._get_helper()] + args
diff --git a/absl/logging/tests/logging_functional_test_helper.py b/absl/logging/tests/logging_functional_test_helper.py
index 0eccc74..b95647b 100644
--- a/absl/logging/tests/logging_functional_test_helper.py
+++ b/absl/logging/tests/logging_functional_test_helper.py
@@ -15,6 +15,7 @@
"""Helper script for logging_functional_test."""
import logging as std_logging
+import logging.config as std_logging_config
import os
import sys
import threading
@@ -306,4 +307,6 @@
if __name__ == '__main__':
sys.argv[0] = 'py_argv_0'
+ if os.environ.get('CALL_DICT_CONFIG') == '1':
+ std_logging_config.dictConfig({'version': 1})
app.run(main)
diff --git a/absl/logging/tests/logging_test.py b/absl/logging/tests/logging_test.py
index c399f37..e5c4fcc 100644
--- a/absl/logging/tests/logging_test.py
+++ b/absl/logging/tests/logging_test.py
@@ -366,6 +366,7 @@
class ABSLHandlerTest(absltest.TestCase):
def setUp(self):
+ super().setUp()
formatter = logging.PythonFormatter()
self.absl_handler = logging.ABSLHandler(formatter)
@@ -438,12 +439,14 @@
sys._getframe.return_value = mock_frame_0
def setUp(self):
+ super().setUp()
self.message = 'Hello Nurse'
self.logger = logging.ABSLLogger('')
def tearDown(self):
mock.patch.stopall()
self.logger._frames_to_skip.clear()
+ super().tearDown()
def test_constructor_without_level(self):
self.logger = logging.ABSLLogger('')
@@ -579,6 +582,7 @@
class ABSLLogPrefixTest(parameterized.TestCase):
def setUp(self):
+ super().setUp()
self.record = std_logging.LogRecord(
'name', std_logging.INFO, 'path/to/source.py', 13, 'log message',
None, None)
@@ -804,28 +808,28 @@
old_level = logging.get_verbosity()
logging.set_verbosity(logging.DEBUG)
- self.assertEquals(logging.get_verbosity(), logging.DEBUG)
+ self.assertEqual(logging.get_verbosity(), logging.DEBUG)
self.assertTrue(logging.level_debug())
self.assertTrue(logging.level_info())
self.assertTrue(logging.level_warning())
self.assertTrue(logging.level_error())
logging.set_verbosity(logging.INFO)
- self.assertEquals(logging.get_verbosity(), logging.INFO)
+ self.assertEqual(logging.get_verbosity(), logging.INFO)
self.assertFalse(logging.level_debug())
self.assertTrue(logging.level_info())
self.assertTrue(logging.level_warning())
self.assertTrue(logging.level_error())
logging.set_verbosity(logging.WARNING)
- self.assertEquals(logging.get_verbosity(), logging.WARNING)
+ self.assertEqual(logging.get_verbosity(), logging.WARNING)
self.assertFalse(logging.level_debug())
self.assertFalse(logging.level_info())
self.assertTrue(logging.level_warning())
self.assertTrue(logging.level_error())
logging.set_verbosity(logging.ERROR)
- self.assertEquals(logging.get_verbosity(), logging.ERROR)
+ self.assertEqual(logging.get_verbosity(), logging.ERROR)
self.assertFalse(logging.level_debug())
self.assertFalse(logging.level_info())
self.assertTrue(logging.level_error())
@@ -837,43 +841,43 @@
# Lowercase names.
logging.set_verbosity('debug')
- self.assertEquals(logging.get_verbosity(), logging.DEBUG)
+ self.assertEqual(logging.get_verbosity(), logging.DEBUG)
logging.set_verbosity('info')
- self.assertEquals(logging.get_verbosity(), logging.INFO)
+ self.assertEqual(logging.get_verbosity(), logging.INFO)
logging.set_verbosity('warning')
- self.assertEquals(logging.get_verbosity(), logging.WARNING)
+ self.assertEqual(logging.get_verbosity(), logging.WARNING)
logging.set_verbosity('warn')
- self.assertEquals(logging.get_verbosity(), logging.WARNING)
+ self.assertEqual(logging.get_verbosity(), logging.WARNING)
logging.set_verbosity('error')
- self.assertEquals(logging.get_verbosity(), logging.ERROR)
+ self.assertEqual(logging.get_verbosity(), logging.ERROR)
logging.set_verbosity('fatal')
# Uppercase names.
- self.assertEquals(logging.get_verbosity(), logging.FATAL)
+ self.assertEqual(logging.get_verbosity(), logging.FATAL)
logging.set_verbosity('DEBUG')
- self.assertEquals(logging.get_verbosity(), logging.DEBUG)
+ self.assertEqual(logging.get_verbosity(), logging.DEBUG)
logging.set_verbosity('INFO')
- self.assertEquals(logging.get_verbosity(), logging.INFO)
+ self.assertEqual(logging.get_verbosity(), logging.INFO)
logging.set_verbosity('WARNING')
- self.assertEquals(logging.get_verbosity(), logging.WARNING)
+ self.assertEqual(logging.get_verbosity(), logging.WARNING)
logging.set_verbosity('WARN')
- self.assertEquals(logging.get_verbosity(), logging.WARNING)
+ self.assertEqual(logging.get_verbosity(), logging.WARNING)
logging.set_verbosity('ERROR')
- self.assertEquals(logging.get_verbosity(), logging.ERROR)
+ self.assertEqual(logging.get_verbosity(), logging.ERROR)
logging.set_verbosity('FATAL')
- self.assertEquals(logging.get_verbosity(), logging.FATAL)
+ self.assertEqual(logging.get_verbosity(), logging.FATAL)
# Integers as strings.
logging.set_verbosity(str(logging.DEBUG))
- self.assertEquals(logging.get_verbosity(), logging.DEBUG)
+ self.assertEqual(logging.get_verbosity(), logging.DEBUG)
logging.set_verbosity(str(logging.INFO))
- self.assertEquals(logging.get_verbosity(), logging.INFO)
+ self.assertEqual(logging.get_verbosity(), logging.INFO)
logging.set_verbosity(str(logging.WARNING))
- self.assertEquals(logging.get_verbosity(), logging.WARNING)
+ self.assertEqual(logging.get_verbosity(), logging.WARNING)
logging.set_verbosity(str(logging.ERROR))
- self.assertEquals(logging.get_verbosity(), logging.ERROR)
+ self.assertEqual(logging.get_verbosity(), logging.ERROR)
logging.set_verbosity(str(logging.FATAL))
- self.assertEquals(logging.get_verbosity(), logging.FATAL)
+ self.assertEqual(logging.get_verbosity(), logging.FATAL)
logging.set_verbosity(old_level)
