summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2010-05-19 15:22:11 (GMT)
committerSteven Knight <knight@baldmt.com>2010-05-19 15:22:11 (GMT)
commit435a720015d6950aac38096509290d7577b08688 (patch)
tree825f844db3a097822bd5db4bd18ecb3471cfa771
parent1ba573a94634f56d954280a1ca6828c4892c8e72 (diff)
downloadSCons-435a720015d6950aac38096509290d7577b08688.zip
SCons-435a720015d6950aac38096509290d7577b08688.tar.gz
SCons-435a720015d6950aac38096509290d7577b08688.tar.bz2
Fix unit test ripple effect from converting SCons.Util.Proxy to a new-style class.
-rw-r--r--src/engine/SCons/Node/FSTests.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/engine/SCons/Node/FSTests.py b/src/engine/SCons/Node/FSTests.py
index ab055e9..9a393e2 100644
--- a/src/engine/SCons/Node/FSTests.py
+++ b/src/engine/SCons/Node/FSTests.py
@@ -1657,9 +1657,11 @@ class FSTestCase(_tempdirTestCase):
def test_proxy(self):
"""Test a Node.FS object wrapped in a proxy instance"""
f1 = self.fs.File('fff')
- p = SCons.Util.Proxy(f1)
+ class MyProxy(SCons.Util.Proxy):
+ __str__ = SCons.Util.Delegate('__str__')
+ p = MyProxy(f1)
f2 = self.fs.Entry(p)
- assert f1 is f2, (f1, f2)
+ assert f1 is f2, (f1, str(f1), f2, str(f2))