[Zodb-checkins] CVS: ZODB4 - test.py:1.8

Jeremy Hylton jeremy@zope.com
Thu, 5 Dec 2002 16:34:58 -0500


Update of /cvs-repository/ZODB4
In directory cvs.zope.org:/tmp/cvs-serv6004

Modified Files:
	test.py 
Log Message:
Move hasgooddir() check higher up to avoid getting skip reports for
BDB built for different python version.


=== ZODB4/test.py 1.7 => 1.8 ===
--- ZODB4/test.py:1.7	Thu Dec  5 15:51:33 2002
+++ ZODB4/test.py	Thu Dec  5 16:34:58 2002
@@ -235,7 +235,11 @@
     def visit(self, rx, dir, files):
         if not dir.endswith("tests"):
             return
+        if not hasgooddir(dir):
+            # built for a different version
+            return
         if not self.check_depends(dir):
+            print dir
             self.skips += 1
             return
         # Since we're running from the build directory, every dir
@@ -244,9 +248,6 @@
         for file in files:
             if file.startswith("test") and file.endswith(".py"):
                 path = os.path.join(dir, file)
-                if not hasgooddir(path):
-                    # built for a different version
-                    continue
                 if match(rx, path):
                     self.files.append(path)