In the error message, supply the file name that triggered on IOError or OSError, not just the target name.

1 files changed, 3 insertions, 5 deletions

diff --git a/src/engine/SCons/TaskmasterTests.py b/src/engine/SCons/TaskmasterTests.py
index f3cb5f0..7e24d2b 100644
--- a/src/engine/SCons/TaskmasterTests.py
+++ b/src/engine/SCons/TaskmasterTests.py
@@ -880,14 +880,12 @@ class TaskmasterTestCase(unittest.TestCase):
         t = tm.next_task()
         try:
             t.execute()
-        except SCons.Errors.BuildError, e:
+        except SCons.Errors.TaskmasterException, e:
             assert e.node == n4, e.node
             assert e.errstr == "Exception", e.errstr
-            assert len(e.args) == 3, `e.args`
-            assert e.args[0] == OtherError, e.args[0]
-            assert isinstance(e.args[1], OtherError), type(e.args[1])
+            assert len(e.exc_info) == 3, e.exc_info
             exc_traceback = sys.exc_info()[2]
-            assert type(e.args[2]) == type(exc_traceback), e.args[2]
+            assert type(e.exc_info[2]) == type(exc_traceback), e.exc_info[2]
         else:
             raise TestFailed, "did not catch expected BuildError"