Skip to content

Commit

Permalink
Allowed to pass the debug level as an empty string
Browse files Browse the repository at this point in the history
  • Loading branch information
evandrocoan committed Feb 5, 2020
1 parent d6550a3 commit 80ac531
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 1 deletion.
7 changes: 6 additions & 1 deletion all/debug_tools/logger.py
Original file line number Diff line number Diff line change
Expand Up @@ -1626,6 +1626,11 @@ def _getLogger(debug_level=127, logger_name=None, **kwargs):

def _get_debug_level(debug_level, logger_name):

if isinstance( debug_level, str ):

if len( debug_level ) == 0:
debug_level = 1;

if logger_name:

if isinstance( logger_name, int ):
Expand All @@ -1651,7 +1656,7 @@ def _get_debug_level(debug_level, logger_name):

else:
logger_name = debug_level
debug_level = 127
debug_level = 1

return debug_level, logger_name

44 changes: 44 additions & 0 deletions tests/testing/main_unit_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -678,6 +678,50 @@ def test_default_logger_creation(self):
self.assertRegexpMatches( output,
r"\d\d:\d\d:\d\d:\d\d\d.\d\d\d\d\d\d \d.\d\de(\+|\-)\d\d - logger.test_default_logger_creation:\d\d\d - Something..." )

def test_logger_name_string_string(self):
getLogger( "", "mylogger" )
log( 1, 'Something...' )

output = _stderr.contents()
self.assertRegexpMatches( output,
r"\d\d:\d\d:\d\d:\d\d\d.\d\d\d\d\d\d \d.\d\de(\+|\-)\d\d - mylogger.test_logger_name_string_string:\d\d\d - Something..." )

def test_logger_name_string_int(self):
getLogger( "", 3 )
log( 1, 'Something...' )
self.assertEqual( 127, log.debug_level )

output = _stderr.contents()
self.assertRegexpMatches( output,
r"\d\d:\d\d:\d\d:\d\d\d.\d\d\d\d\d\d \d.\d\de(\+|\-)\d\d - logger.test_logger_name_string_int:\d\d\d - Something..." )

def test_logger_name_string_empty(self):
getLogger( "", "" )
log( 1, 'Something...' )
self.assertEqual( 1, log.debug_level )

output = _stderr.contents()
self.assertRegexpMatches( output,
r"\d\d:\d\d:\d\d:\d\d\d.\d\d\d\d\d\d \d.\d\de(\+|\-)\d\d - logger.test_logger_name_string_empty:\d\d\d - Something..." )

def test_logger_name_int_empty(self):
getLogger( 3, "" )
log( 1, 'Something...' )
self.assertEqual( 3, log.debug_level )

output = _stderr.contents()
self.assertRegexpMatches( output,
r"\d\d:\d\d:\d\d:\d\d\d.\d\d\d\d\d\d \d.\d\de(\+|\-)\d\d - logger.test_logger_name_int_empty:\d\d\d - Something..." )

def test_logger_name_int_int(self):
getLogger( 3, "" )
log( 1, 'Something...' )
self.assertEqual( 3, log.debug_level )

output = _stderr.contents()
self.assertRegexpMatches( output,
r"\d\d:\d\d:\d\d:\d\d\d.\d\d\d\d\d\d \d.\d\de(\+|\-)\d\d - logger.test_logger_name_int_int:\d\d\d - Something..." )

def test_not_msecs(self):
getLogger( 1 )
log( 'Something...', msecs=0 )
Expand Down

0 comments on commit 80ac531

Please sign in to comment.