diff options
author | Steven Knight <knight@baldmt.com> | 2005-10-14 16:23:52 (GMT) |
---|---|---|
committer | Steven Knight <knight@baldmt.com> | 2005-10-14 16:23:52 (GMT) |
commit | af962864b108d8fdd654edaf3c0300404ca07e3e (patch) | |
tree | 3a6877e15644a6da25570af9ee7aade000983ad4 /src/engine/SCons | |
parent | 82c2f16e53cba1a639d568fe8d6780dfe30c56ab (diff) | |
download | SCons-af962864b108d8fdd654edaf3c0300404ca07e3e.zip SCons-af962864b108d8fdd654edaf3c0300404ca07e3e.tar.gz SCons-af962864b108d8fdd654edaf3c0300404ca07e3e.tar.bz2 |
Get rid of indentation tabs in the test scripts and have runtest.py invoke them with the python -tt option to keep them out.
Diffstat (limited to 'src/engine/SCons')
-rw-r--r-- | src/engine/SCons/ActionTests.py | 92 | ||||
-rw-r--r-- | src/engine/SCons/BuilderTests.py | 38 | ||||
-rw-r--r-- | src/engine/SCons/EnvironmentTests.py | 94 | ||||
-rw-r--r-- | src/engine/SCons/ErrorsTests.py | 8 | ||||
-rw-r--r-- | src/engine/SCons/Scanner/IDLTests.py | 40 | ||||
-rw-r--r-- | src/engine/SCons/Sig/MD5Tests.py | 32 | ||||
-rw-r--r-- | src/engine/SCons/Sig/TimeStampTests.py | 32 | ||||
-rw-r--r-- | src/engine/SCons/Tool/JavaCommonTests.py | 8 | ||||
-rw-r--r-- | src/engine/SCons/Tool/msvsTests.py | 10 | ||||
-rw-r--r-- | src/engine/SCons/WarningsTests.py | 2 |
10 files changed, 178 insertions, 178 deletions
diff --git a/src/engine/SCons/ActionTests.py b/src/engine/SCons/ActionTests.py index ff23cd7..011cc0d 100644 --- a/src/engine/SCons/ActionTests.py +++ b/src/engine/SCons/ActionTests.py @@ -540,7 +540,7 @@ class _ActionActionTestCase(unittest.TestCase): def exitstatfunc(stat, result=exitstatfunc_result): result.append(stat) - return stat + return stat result = a("out", "in", env, exitstatfunc=exitstatfunc) assert result == 0, result @@ -840,37 +840,37 @@ class CommandActionTestCase(unittest.TestCase): s = act4.strfunction([t1], [s1], env) assert s is None, s - act = SCons.Action.CommandAction("@foo bar") - s = act.strfunction([], [], env) - assert s == "", s + act = SCons.Action.CommandAction("@foo bar") + s = act.strfunction([], [], env) + assert s == "", s - act = SCons.Action.CommandAction("@-foo bar") - s = act.strfunction([], [], env) - assert s == "", s + act = SCons.Action.CommandAction("@-foo bar") + s = act.strfunction([], [], env) + assert s == "", s - act = SCons.Action.CommandAction("-@foo bar") - s = act.strfunction([], [], env) - assert s == "", s + act = SCons.Action.CommandAction("-@foo bar") + s = act.strfunction([], [], env) + assert s == "", s - act = SCons.Action.CommandAction("-foo bar") - s = act.strfunction([], [], env) - assert s == "foo bar", s + act = SCons.Action.CommandAction("-foo bar") + s = act.strfunction([], [], env) + assert s == "foo bar", s - act = SCons.Action.CommandAction("@ foo bar") - s = act.strfunction([], [], env) - assert s == "", s + act = SCons.Action.CommandAction("@ foo bar") + s = act.strfunction([], [], env) + assert s == "", s - act = SCons.Action.CommandAction("@- foo bar") - s = act.strfunction([], [], env) - assert s == "", s + act = SCons.Action.CommandAction("@- foo bar") + s = act.strfunction([], [], env) + assert s == "", s - act = SCons.Action.CommandAction("-@ foo bar") - s = act.strfunction([], [], env) - assert s == "", s + act = SCons.Action.CommandAction("-@ foo bar") + s = act.strfunction([], [], env) + assert s == "", s - act = SCons.Action.CommandAction("- foo bar") - s = act.strfunction([], [], env) - assert s == "foo bar", s + act = SCons.Action.CommandAction("- foo bar") + s = act.strfunction([], [], env) + assert s == "foo bar", s def test_execute(self): """Test execution of command Actions @@ -994,33 +994,33 @@ class CommandActionTestCase(unittest.TestCase): r = act([], [], env.Copy(out = outfile)) assert r == expect_nonexecutable, "r == %d" % r - act = SCons.Action.CommandAction('%s %s 1' % (python, exit_py)) - r = act([], [], env) - assert r == 1, r + act = SCons.Action.CommandAction('%s %s 1' % (python, exit_py)) + r = act([], [], env) + assert r == 1, r - act = SCons.Action.CommandAction('@%s %s 1' % (python, exit_py)) - r = act([], [], env) - assert r == 1, r + act = SCons.Action.CommandAction('@%s %s 1' % (python, exit_py)) + r = act([], [], env) + assert r == 1, r - act = SCons.Action.CommandAction('@-%s %s 1' % (python, exit_py)) - r = act([], [], env) - assert r == 0, r + act = SCons.Action.CommandAction('@-%s %s 1' % (python, exit_py)) + r = act([], [], env) + assert r == 0, r - act = SCons.Action.CommandAction('-%s %s 1' % (python, exit_py)) - r = act([], [], env) - assert r == 0, r + act = SCons.Action.CommandAction('-%s %s 1' % (python, exit_py)) + r = act([], [], env) + assert r == 0, r - act = SCons.Action.CommandAction('@ %s %s 1' % (python, exit_py)) - r = act([], [], env) - assert r == 1, r + act = SCons.Action.CommandAction('@ %s %s 1' % (python, exit_py)) + r = act([], [], env) + assert r == 1, r - act = SCons.Action.CommandAction('@- %s %s 1' % (python, exit_py)) - r = act([], [], env) - assert r == 0, r + act = SCons.Action.CommandAction('@- %s %s 1' % (python, exit_py)) + r = act([], [], env) + assert r == 0, r - act = SCons.Action.CommandAction('- %s %s 1' % (python, exit_py)) - r = act([], [], env) - assert r == 0, r + act = SCons.Action.CommandAction('- %s %s 1' % (python, exit_py)) + r = act([], [], env) + assert r == 0, r def _DO_NOT_EXECUTE_test_pipe_execute(self): """Test capturing piped output from an action diff --git a/src/engine/SCons/BuilderTests.py b/src/engine/SCons/BuilderTests.py index 3c98e27..233336c 100644 --- a/src/engine/SCons/BuilderTests.py +++ b/src/engine/SCons/BuilderTests.py @@ -778,20 +778,20 @@ class BuilderTestCase(unittest.TestCase): tgt = builder2(env, target='baz', source=['test.bar', 'test2.foo', 'test3.txt'])[0] - s = str(tgt) - assert s == 'baz', s - s = map(str, tgt.sources) - assert s == ['test.foo', 'test2.foo', 'test3.txt'], s - s = map(str, tgt.sources[0].sources) - assert s == ['test.bar'], s + s = str(tgt) + assert s == 'baz', s + s = map(str, tgt.sources) + assert s == ['test.foo', 'test2.foo', 'test3.txt'], s + s = map(str, tgt.sources[0].sources) + assert s == ['test.bar'], s tgt = builder2(env, None, 'aaa.bar')[0] - s = str(tgt) - assert s == 'aaa', s - s = map(str, tgt.sources) - assert s == ['aaa.foo'], s - s = map(str, tgt.sources[0].sources) - assert s == ['aaa.bar'], s + s = str(tgt) + assert s == 'aaa', s + s = map(str, tgt.sources) + assert s == ['aaa.foo'], s + s = map(str, tgt.sources[0].sources) + assert s == ['aaa.bar'], s builder3 = SCons.Builder.MultiStepBuilder(action = 'foo', src_builder = 'xyzzy', @@ -810,14 +810,14 @@ class BuilderTestCase(unittest.TestCase): suffix='.exe', src_suffix='.obj') tgt = builder6(env, 'test', 'test.i')[0] - s = str(tgt) + s = str(tgt) assert s == 'test.exe', s - s = map(str, tgt.sources) - assert s == ['test_wrap.obj'], s - s = map(str, tgt.sources[0].sources) - assert s == ['test_wrap.c'], s - s = map(str, tgt.sources[0].sources[0].sources) - assert s == ['test.i'], s + s = map(str, tgt.sources) + assert s == ['test_wrap.obj'], s + s = map(str, tgt.sources[0].sources) + assert s == ['test_wrap.c'], s + s = map(str, tgt.sources[0].sources[0].sources) + assert s == ['test.i'], s def test_CompositeBuilder(self): """Testing CompositeBuilder class.""" diff --git a/src/engine/SCons/EnvironmentTests.py b/src/engine/SCons/EnvironmentTests.py index 4b222b8..caf8b4a 100644 --- a/src/engine/SCons/EnvironmentTests.py +++ b/src/engine/SCons/EnvironmentTests.py @@ -38,7 +38,7 @@ def diff_env(env1, env2): s2 = "env2 = {\n" d = {} for k in env1._dict.keys() + env2._dict.keys(): - d[k] = None + d[k] = None keys = d.keys() keys.sort() for k in keys: @@ -60,7 +60,7 @@ def diff_dict(d1, d2): s2 = "d2 = {\n" d = {} for k in d1.keys() + d2.keys(): - d[k] = None + d[k] = None keys = d.keys() keys.sort() for k in keys: @@ -627,27 +627,27 @@ class BaseTestCase(unittest.TestCase): def test_Builder_execs(self): - """Test Builder execution through different environments + """Test Builder execution through different environments - One environment is initialized with a single - Builder object, one with a list of a single Builder - object, and one with a list of two Builder objects. - """ - global built_it + One environment is initialized with a single + Builder object, one with a list of a single Builder + object, and one with a list of two Builder objects. + """ + global built_it - b1 = Builder() - b2 = Builder() + b1 = Builder() + b2 = Builder() - built_it = {} + built_it = {} env3 = Environment() env3.Replace(BUILDERS = { 'builder1' : b1, 'builder2' : b2 }) - env3.builder1.execute(target = 'out1') - env3.builder2.execute(target = 'out2') - env3.builder1.execute(target = 'out3') - assert built_it['out1'] - assert built_it['out2'] - assert built_it['out3'] + env3.builder1.execute(target = 'out1') + env3.builder2.execute(target = 'out2') + env3.builder1.execute(target = 'out3') + assert built_it['out1'] + assert built_it['out2'] + assert built_it['out3'] env4 = env3.Copy() assert env4.builder1.env is env4, "builder1.env (%s) == env3 (%s)?" % (env4.builder1.env, env3) @@ -747,13 +747,13 @@ class BaseTestCase(unittest.TestCase): assert s == [s1, s1, None, s3, s3], s def test_ENV(self): - """Test setting the external ENV in Environments - """ - env = Environment() - assert env.Dictionary().has_key('ENV') + """Test setting the external ENV in Environments + """ + env = Environment() + assert env.Dictionary().has_key('ENV') - env = Environment(ENV = { 'PATH' : '/foo:/bar' }) - assert env.Dictionary('ENV')['PATH'] == '/foo:/bar' + env = Environment(ENV = { 'PATH' : '/foo:/bar' }) + assert env.Dictionary('ENV')['PATH'] == '/foo:/bar' def test_ReservedVariables(self): """Test generation of warnings when reserved variable names @@ -1383,28 +1383,28 @@ def generate(env): assert x is None, x def test_Dictionary(self): - """Test retrieval of known construction variables - - Fetch them from the Dictionary and check for well-known - defaults that get inserted. - """ - env = Environment(XXX = 'x', YYY = 'y', ZZZ = 'z') - assert env.Dictionary('XXX') == 'x' - assert env.Dictionary('YYY') == 'y' - assert env.Dictionary('XXX', 'ZZZ') == ['x', 'z'] - xxx, zzz = env.Dictionary('XXX', 'ZZZ') - assert xxx == 'x' - assert zzz == 'z' - assert env.Dictionary().has_key('BUILDERS') - assert env.Dictionary().has_key('CC') - assert env.Dictionary().has_key('CCFLAGS') - assert env.Dictionary().has_key('ENV') - - assert env['XXX'] == 'x' - env['XXX'] = 'foo' - assert env.Dictionary('XXX') == 'foo' - del env['XXX'] - assert not env.Dictionary().has_key('XXX') + """Test retrieval of known construction variables + + Fetch them from the Dictionary and check for well-known + defaults that get inserted. + """ + env = Environment(XXX = 'x', YYY = 'y', ZZZ = 'z') + assert env.Dictionary('XXX') == 'x' + assert env.Dictionary('YYY') == 'y' + assert env.Dictionary('XXX', 'ZZZ') == ['x', 'z'] + xxx, zzz = env.Dictionary('XXX', 'ZZZ') + assert xxx == 'x' + assert zzz == 'z' + assert env.Dictionary().has_key('BUILDERS') + assert env.Dictionary().has_key('CC') + assert env.Dictionary().has_key('CCFLAGS') + assert env.Dictionary().has_key('ENV') + + assert env['XXX'] == 'x' + env['XXX'] = 'foo' + assert env.Dictionary('XXX') == 'foo' + del env['XXX'] + assert not env.Dictionary().has_key('XXX') def test_FindIxes(self): "Test FindIxes()" @@ -2381,7 +2381,7 @@ def generate(env): assert i.path == 'dir2' def test_Install(self): - """Test the Install method""" + """Test the Install method""" env = Environment(FOO='iii', BAR='jjj') tgt = env.Install('export', [ 'build/foo1', 'build/foo2' ]) @@ -2428,7 +2428,7 @@ def generate(env): assert match, e def test_InstallAs(self): - """Test the InstallAs method""" + """Test the InstallAs method""" env = Environment(FOO='iii', BAR='jjj') tgt = env.InstallAs(target=string.split('foo1 foo2'), diff --git a/src/engine/SCons/ErrorsTests.py b/src/engine/SCons/ErrorsTests.py index b0b50d4..c63d988 100644 --- a/src/engine/SCons/ErrorsTests.py +++ b/src/engine/SCons/ErrorsTests.py @@ -38,21 +38,21 @@ class ErrorsTestCase(unittest.TestCase): assert e.errstr == "foo" def test_InternalError(self): - """Test the InternalError exception.""" + """Test the InternalError exception.""" try: raise SCons.Errors.InternalError, "test internal error" except SCons.Errors.InternalError, e: assert e.args == ("test internal error",) def test_UserError(self): - """Test the UserError exception.""" + """Test the UserError exception.""" try: raise SCons.Errors.UserError, "test user error" except SCons.Errors.UserError, e: assert e.args == ("test user error",) def test_ExplicitExit(self): - """Test the ExplicitExit exception.""" + """Test the ExplicitExit exception.""" try: raise SCons.Errors.ExplicitExit, "node" except SCons.Errors.ExplicitExit, e: @@ -61,4 +61,4 @@ class ErrorsTestCase(unittest.TestCase): if __name__ == "__main__": suite = unittest.makeSuite(ErrorsTestCase, 'test_') if not unittest.TextTestRunner().run(suite).wasSuccessful(): - sys.exit(1) + sys.exit(1) diff --git a/src/engine/SCons/Scanner/IDLTests.py b/src/engine/SCons/Scanner/IDLTests.py index 5f2bb1f..153951d 100644 --- a/src/engine/SCons/Scanner/IDLTests.py +++ b/src/engine/SCons/Scanner/IDLTests.py @@ -44,11 +44,11 @@ test.write('t1.idl',''' import "f3.idl"; [ - object, - uuid(22995106-CE26-4561-AF1B-C71C6934B840), - dual, - helpstring("IBarObject Interface"), - pointer_default(unique) + object, + uuid(22995106-CE26-4561-AF1B-C71C6934B840), + dual, + helpstring("IBarObject Interface"), + pointer_default(unique) ] interface IBarObject : IDispatch { @@ -62,11 +62,11 @@ test.write('t2.idl',""" import <f3.idl>; [ - object, - uuid(22995106-CE26-4561-AF1B-C71C6934B840), - dual, - helpstring(\"IBarObject Interface\"), - pointer_default(unique) + object, + uuid(22995106-CE26-4561-AF1B-C71C6934B840), + dual, + helpstring(\"IBarObject Interface\"), + pointer_default(unique) ] interface IBarObject : IDispatch { @@ -93,11 +93,11 @@ include \t \"never.idl\" const char* x = \"#include <never.idl>\" [ - object, - uuid(22995106-CE26-4561-AF1B-C71C6934B840), - dual, - helpstring(\"IBarObject Interface\"), - pointer_default(unique) + object, + uuid(22995106-CE26-4561-AF1B-C71C6934B840), + dual, + helpstring(\"IBarObject Interface\"), + pointer_default(unique) ] interface IBarObject : IDispatch { @@ -130,11 +130,11 @@ test.write('t4.idl',""" #include <fb.idl> [ - object, - uuid(22995106-CE26-4561-AF1B-C71C6934B840), - dual, - helpstring(\"IBarObject Interface\"), - pointer_default(unique) + object, + uuid(22995106-CE26-4561-AF1B-C71C6934B840), + dual, + helpstring(\"IBarObject Interface\"), + pointer_default(unique) ] interface IBarObject : IDispatch { diff --git a/src/engine/SCons/Sig/MD5Tests.py b/src/engine/SCons/Sig/MD5Tests.py index 67bdfc9..ba18264 100644 --- a/src/engine/SCons/Sig/MD5Tests.py +++ b/src/engine/SCons/Sig/MD5Tests.py @@ -38,42 +38,42 @@ class my_obj: """ def __init__(self, value = ""): - self.value = value + self.value = value def get_signature(self): if not hasattr(self, "sig"): - self.sig = signature(self) - return self.sig + self.sig = signature(self) + return self.sig def get_contents(self): - return self.value + return self.value class MD5TestCase(unittest.TestCase): def test_current(self): - """Test deciding if an object is up-to-date + """Test deciding if an object is up-to-date - Simple comparison of different "signature" values. - """ - obj = my_obj('111') - assert not current(obj.get_signature(), signature(my_obj('110'))) - assert current(obj.get_signature(), signature(my_obj('111'))) - assert not current(obj.get_signature(), signature(my_obj('112'))) + Simple comparison of different "signature" values. + """ + obj = my_obj('111') + assert not current(obj.get_signature(), signature(my_obj('110'))) + assert current(obj.get_signature(), signature(my_obj('111'))) + assert not current(obj.get_signature(), signature(my_obj('112'))) def test_collect(self): - """Test collecting a list of signatures into a new signature value - """ + """Test collecting a list of signatures into a new signature value + """ s = map(signature, map(my_obj, ('111', '222', '333'))) assert '698d51a19d8a121ce581499d7b701668' == collect(s[0:1]) assert '8980c988edc2c78cc43ccb718c06efd5' == collect(s[0:2]) - assert '53fd88c84ff8a285eb6e0a687e55b8c7' == collect(s) + assert '53fd88c84ff8a285eb6e0a687e55b8c7' == collect(s) def test_signature(self): """Test generating a signature""" - o1 = my_obj(value = '111') + o1 = my_obj(value = '111') s = signature(o1) assert '698d51a19d8a121ce581499d7b701668' == s, s @@ -110,4 +110,4 @@ class MD5TestCase(unittest.TestCase): if __name__ == "__main__": suite = unittest.makeSuite(MD5TestCase, 'test_') if not unittest.TextTestRunner().run(suite).wasSuccessful(): - sys.exit(1) + sys.exit(1) diff --git a/src/engine/SCons/Sig/TimeStampTests.py b/src/engine/SCons/Sig/TimeStampTests.py index 1fca73f..49c5cfb 100644 --- a/src/engine/SCons/Sig/TimeStampTests.py +++ b/src/engine/SCons/Sig/TimeStampTests.py @@ -36,10 +36,10 @@ class my_obj: """ def __init__(self, value = 0): - self.value = value + self.value = value def get_signature(self): - return self.value + return self.value def get_timestamp(self): return self.value @@ -48,23 +48,23 @@ class my_obj: class TimeStampTestCase(unittest.TestCase): def test_current(self): - """Test deciding if an object is up-to-date + """Test deciding if an object is up-to-date - Simple comparison of different timestamp values. - """ - o1 = my_obj(value = 111) - assert not current(o1.get_signature(), 110) - assert current(o1.get_signature(), 111) - assert current(o1.get_signature(), 112) + Simple comparison of different timestamp values. + """ + o1 = my_obj(value = 111) + assert not current(o1.get_signature(), 110) + assert current(o1.get_signature(), 111) + assert current(o1.get_signature(), 112) def test_collect(self): - """Test collecting a list of signatures into a new signature value - into a new timestamp value. - """ + """Test collecting a list of signatures into a new signature value + into a new timestamp value. + """ - assert 111 == collect((111,)) - assert 222 == collect((111, 222)) - assert 333 == collect((333, 222, 111)) + assert 111 == collect((111,)) + assert 222 == collect((111, 222)) + assert 333 == collect((333, 222, 111)) def test_signature(self): """Test generating a signature""" @@ -81,4 +81,4 @@ class TimeStampTestCase(unittest.TestCase): if __name__ == "__main__": suite = unittest.makeSuite(TimeStampTestCase, 'test_') if not unittest.TextTestRunner().run(suite).wasSuccessful(): - sys.exit(1) + sys.exit(1) diff --git a/src/engine/SCons/Tool/JavaCommonTests.py b/src/engine/SCons/Tool/JavaCommonTests.py index 352b7ee..f8f38c2 100644 --- a/src/engine/SCons/Tool/JavaCommonTests.py +++ b/src/engine/SCons/Tool/JavaCommonTests.py @@ -193,10 +193,10 @@ public class Test { pkg_dir, classes = SCons.Tool.JavaCommon.parse_java("""\ public class MyTabs { - private class MyInternal - { - } - private final static String PATH = "images\\\\"; + private class MyInternal + { + } + private final static String PATH = "images\\\\"; } """) assert pkg_dir == None, pkg_dir diff --git a/src/engine/SCons/Tool/msvsTests.py b/src/engine/SCons/Tool/msvsTests.py index 4343521..53198d4 100644 --- a/src/engine/SCons/Tool/msvsTests.py +++ b/src/engine/SCons/Tool/msvsTests.py @@ -445,7 +445,7 @@ if __name__ == "__main__": print "Test MSVS 6 Registry" # print str(registry.root) if not unittest.TextTestRunner().run(suite).wasSuccessful(): - sys.exit(1) + sys.exit(1) registry = DummyRegistry(regdata_6b) default_version = '6.0' @@ -456,7 +456,7 @@ if __name__ == "__main__": print "Test Other MSVS 6 Registry" # print str(registry.root) if not unittest.TextTestRunner().run(suite).wasSuccessful(): - sys.exit(1) + sys.exit(1) registry = DummyRegistry(regdata_67) default_version = '7.0' @@ -467,7 +467,7 @@ if __name__ == "__main__": # print str(registry.root) print "Test MSVS 6 & 7 Registry" if not unittest.TextTestRunner().run(suite).wasSuccessful(): - sys.exit(1) + sys.exit(1) registry = DummyRegistry(regdata_7) default_version = '7.0' @@ -478,7 +478,7 @@ if __name__ == "__main__": # print str(registry.root) print "Test MSVS 7 Registry" if not unittest.TextTestRunner().run(suite).wasSuccessful(): - sys.exit(1) + sys.exit(1) registry = DummyRegistry(regdata_none) default_version = '6.0' @@ -489,4 +489,4 @@ if __name__ == "__main__": # print str(registry.root) print "Test Empty Registry" if not unittest.TextTestRunner().run(suite).wasSuccessful(): - sys.exit(1) + sys.exit(1) diff --git a/src/engine/SCons/WarningsTests.py b/src/engine/SCons/WarningsTests.py index 38fa0f5..0964699 100644 --- a/src/engine/SCons/WarningsTests.py +++ b/src/engine/SCons/WarningsTests.py @@ -122,4 +122,4 @@ class WarningsTestCase(unittest.TestCase): if __name__ == "__main__": suite = unittest.makeSuite(WarningsTestCase, 'test_') if not unittest.TextTestRunner().run(suite).wasSuccessful(): - sys.exit(1) + sys.exit(1) |