From e5940adedbb88877eb0a52f9dd9fe26e032fc9ba Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 12 Nov 2018 08:37:19 -0800 Subject: Change test for str(node1) is str(node2) to use ==. Expecting that the strings would have the same id() is not reasonable. Expecting their values are equal is. --- src/engine/SCons/Node/FSTests.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/engine/SCons/Node/FSTests.py b/src/engine/SCons/Node/FSTests.py index b39d1e3..23ec48e 100644 --- a/src/engine/SCons/Node/FSTests.py +++ b/src/engine/SCons/Node/FSTests.py @@ -1134,7 +1134,10 @@ class FSTestCase(_tempdirTestCase): e1 = fs.Entry(p) e2 = fs.Entry(path) assert e1 is e2, (e1, e2) - assert str(e1) is str(e2), (str(e1), str(e2)) + a=str(e1) + b=str(e2) + assert a == b, ("Strings should match for same file/node\n%s\n%s"%(a,b)) + # Test for a bug in 0.04 that did not like looking up # dirs with a trailing slash on Windows. -- cgit v0.12