Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion P4PythonDebug.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,11 @@ void PythonDebug::callLogger(const char * method, const char * text)

PyObject * result = PyObject_CallMethod( logger , (char*) method, (char*)"(s)", text );
if( result == NULL ) { // exception thrown
cerr << "Failed to call " << method << " on logger with (" << text << ")" << endl;
PyErr_WriteUnraisable(logger);
}
else
{
Py_DECREF(result);
}
}

Expand Down
42 changes: 42 additions & 0 deletions p4test.py
Original file line number Diff line number Diff line change
Expand Up @@ -1495,6 +1495,48 @@ def testLogger( self ):
self.p4.logger = None
self.assertEqual(self.p4.logger, None, "Logger not reset correctly")

def testLoggerExceptionIsUnraisable(self):
if not hasattr(sys, "unraisablehook"):
self.skipTest("sys.unraisablehook is not available")

class RaisingLogger:
def info(self, message):
if message.startswith("[P4]"):
raise ValueError("logger callback failed")

def debug(self, message):
pass

def warning(self, message):
pass

def error(self, message):
pass

def critical(self, message):
pass

logger = RaisingLogger()
original_logger = self.p4.logger
original_hook = sys.unraisablehook
unraisable = []

self.p4.connect()
try:
self.p4.logger = logger
self.p4.debug = 1
sys.unraisablehook = unraisable.append
result = self.p4.run_info()
finally:
sys.unraisablehook = original_hook
self.p4.logger = original_logger

self.assertTrue(result, "p4 info failed after an unraisable logger exception")
self.assertEqual(len(unraisable), 1, "Logger exception was not reported as unraisable")
self.assertIs(unraisable[0].exc_type, ValueError)
self.assertEqual(str(unraisable[0].exc_value), "logger callback failed")
self.assertIs(unraisable[0].object, logger)

def testDVCS_init( self ):
self.p4.connect()
current_pwd = self.server_root
Expand Down