Tweak a few tests

"for i in range(len(foo))" idiom changed to iterate directly over lists
instead of indexing them.  zip() generates the iterator in the case with
two lists. reversed() used for the Windows drive-letter test.

gdbm is not gone, just renamed. change test to find under either name.

Use a context manager for closing StringIO objects opened for capturing
standard I/O streams.

Signed-off-by: Mats Wichmann <mats@linux.com>

1 files changed, 9 insertions, 4 deletions

diff --git a/test/SConsignFile/use-gdbm.py b/test/SConsignFile/use-gdbm.py
index 8f863fb..12a2e8b 100644
--- a/test/SConsignFile/use-gdbm.py
+++ b/test/SConsignFile/use-gdbm.py
@@ -36,8 +36,13 @@ test = TestSCons.TestSCons()
 
 try:
     import gdbm
+    use_dbm = "gdbm"
 except ImportError:
-    test.skip_test('No gdbm in this version of Python; skipping test.\n')
+    try:
+        import dbm.gnu
+        use_dbm = "dbm.gnu"
+    except ImportError:
+        test.skip_test('No GNU dbm in this version of Python; skipping test.\n')
 
 test.subdir('subdir')
 
@@ -51,8 +56,8 @@ sys.exit(0)
 #
 test.write('SConstruct', """
 import sys
-import gdbm
-SConsignFile('.sconsign', gdbm)
+import %(use_dbm)s
+SConsignFile('.sconsign', %(use_dbm)s)
 B = Builder(action = '%(_python_)s build.py $TARGETS $SOURCES')
 env = Environment(BUILDERS = { 'B' : B })
 env.B(target = 'f1.out', source = 'f1.in')
@@ -72,7 +77,7 @@ test.must_exist(test.workpath('.sconsign'))
 test.must_not_exist(test.workpath('.sconsign.dblite'))
 test.must_not_exist(test.workpath('subdir', '.sconsign'))
 test.must_not_exist(test.workpath('subdir', '.sconsign.dblite'))
-  
+
 test.must_match('f1.out', "f1.in\n")
 test.must_match('f2.out', "f2.in\n")
 test.must_match(['subdir', 'f3.out'], "subdir/f3.in\n")