Move all the test input/output files around so the test/ directory is available for Zope-style regression tests; these will appear later.

9a27d058 · Fred Drake · ab80f6d3 · 9a27d058 · 9a27d058 · 9a27d058
Commit 9a27d058 authored Mar 16, 2001 by Fred Drake
70 changed files
--- a/lib/python/TAL/driver.py
+++ b/lib/python/TAL/driver.py
@@ -102,7 +102,7 @@ except ImportError:
 # Import local classes
 from DummyEngine import DummyEngine

-FILE = "test/test1.xml"
+FILE = "test/input/test1.xml"

 def main():
    versionTest = 1
@@ -116,7 +116,7 @@ def main():
            "usage: driver.py [-h|-x] [-m] [-n] [file]\n")
        sys.stderr.write("-h/-x -- HTML/XML input (default auto)\n")
        sys.stderr.write("-m -- macro expansion only\n")
-        sys.stderr.write("-n -- turn of the Python 1.5.2 test\n")
+        sys.stderr.write("-n -- turn off the Python 1.5.2 test\n")
        sys.exit(2)
    for o, a in opts:
        if o == '-h':

--- a/lib/python/TAL/runtest.py
+++ b/lib/python/TAL/runtest.py
@@ -125,7 +125,7 @@ def main():
        opts.append(args[0])
        del args[0]
    if not args:
-        prefix = os.path.join("test", "test*.")
+        prefix = os.path.join("test", "input", "test*.")
        xmlargs = glob.glob(prefix + "xml")
        xmlargs.sort()
        htmlargs = glob.glob(prefix + "html")
@@ -157,8 +157,8 @@ def main():
            continue
        head, tail = os.path.split(arg)
        outfile = os.path.join(
-            head,
-            string.replace(tail, "test", "out"))
+            string.replace(head, "input", "output"),
+            tail)
        try:
            f = open(outfile)
        except IOError:

--- a/lib/python/TAL/test/test1.html
+++ b/lib/python/TAL/test/test1.html
--- a/lib/python/TAL/test/test1.xml
+++ b/lib/python/TAL/test/test1.xml
--- a/lib/python/TAL/test/test2.html
+++ b/lib/python/TAL/test/test2.html
--- a/lib/python/TAL/test/test2.xml
+++ b/lib/python/TAL/test/test2.xml
--- a/lib/python/TAL/test/test3.html
+++ b/lib/python/TAL/test/test3.html
--- a/lib/python/TAL/test/test3.xml
+++ b/lib/python/TAL/test/test3.xml
--- a/lib/python/TAL/test/test4.html
+++ b/lib/python/TAL/test/test4.html
--- a/lib/python/TAL/test/test4.xml
+++ b/lib/python/TAL/test/test4.xml
--- a/lib/python/TAL/test/test5.html
+++ b/lib/python/TAL/test/test5.html
--- a/lib/python/TAL/test/test5.xml
+++ b/lib/python/TAL/test/test5.xml
--- a/lib/python/TAL/test/test6.html
+++ b/lib/python/TAL/test/test6.html
 <?xml version="1.0" ?>
 <html>
  <body xmlns:m="http://xml.zope.org/namespaces/metal"
-        m:use-macro="test/test5.xml/body">
+        m:use-macro="test/input/test5.xml/body">
    dummy body in test6
  </body>
 </html>
--- a/lib/python/TAL/test/test6.xml
+++ b/lib/python/TAL/test/test6.xml
 <?xml version="1.0" ?>
 <html>
  <body xmlns:m="http://xml.zope.org/namespaces/metal"
-        m:use-macro="test/test5.xml/body">
+        m:use-macro="test/input/test5.xml/body">
    dummy body in test6
  </body>
 </html>
--- a/lib/python/TAL/test/test7.html
+++ b/lib/python/TAL/test/test7.html
--- a/lib/python/TAL/test/test7.xml
+++ b/lib/python/TAL/test/test7.xml
--- a/lib/python/TAL/tests/test8.html
+++ b/lib/python/TAL/tests/test8.html
 <?xml version="1.0" ?>
-<table xmlns:m="http://xml.zope.org/namespaces/metal" m:use-macro="test/test7.xml/myTable">
+<table xmlns:m="http://xml.zope.org/namespaces/metal" m:use-macro="test/input/test7.xml/myTable">
 <!-- macro use with slots -->
  <tr>
    <td>

--- a/lib/python/TAL/tests/test8.xml
+++ b/lib/python/TAL/tests/test8.xml
 <?xml version="1.0" ?>
-<table xmlns:m="http://xml.zope.org/namespaces/metal" m:use-macro="test/test7.xml/myTable">
+<table xmlns:m="http://xml.zope.org/namespaces/metal" m:use-macro="test/input/test7.xml/myTable">
 <!-- macro use with slots -->
  <tr>
    <td>

--- a/lib/python/TAL/test/test9.html
+++ b/lib/python/TAL/test/test9.html
--- a/lib/python/TAL/test/out1.html
+++ b/lib/python/TAL/test/out1.html
--- a/lib/python/TAL/test/out1.xml
+++ b/lib/python/TAL/test/out1.xml
--- a/lib/python/TAL/test/out2.html
+++ b/lib/python/TAL/test/out2.html
--- a/lib/python/TAL/tests/test2.xml
+++ b/lib/python/TAL/tests/test2.xml
--- a/lib/python/TAL/test/out3.html
+++ b/lib/python/TAL/test/out3.html
--- a/lib/python/TAL/test/out3.xml
+++ b/lib/python/TAL/test/out3.xml
--- a/lib/python/TAL/test/out4.html
+++ b/lib/python/TAL/test/out4.html
--- a/lib/python/TAL/test/out4.xml
+++ b/lib/python/TAL/test/out4.xml
--- a/lib/python/TAL/tests/test5.html
+++ b/lib/python/TAL/tests/test5.html
--- a/lib/python/TAL/tests/test5.xml
+++ b/lib/python/TAL/tests/test5.xml
--- a/lib/python/TAL/test/out6.html
+++ b/lib/python/TAL/test/out6.html
 <?xml version="1.0" ?>
 <html>
-  <body xmlns:m="http://xml.zope.org/namespaces/metal" m:use-macro="test/test5.xml/body">
+  <body xmlns:m="http://xml.zope.org/namespaces/metal" m:use-macro="test/input/test5.xml/body">

    <h1>This is the body of test5</h1>


--- a/lib/python/TAL/test/out6.xml
+++ b/lib/python/TAL/test/out6.xml
 <?xml version="1.0" ?>
 <html>
-  <body xmlns:m="http://xml.zope.org/namespaces/metal" m:use-macro="test/test5.xml/body">
+  <body xmlns:m="http://xml.zope.org/namespaces/metal" m:use-macro="test/input/test5.xml/body">

    <h1>This is the body of test5</h1>


--- a/lib/python/TAL/tests/test7.html
+++ b/lib/python/TAL/tests/test7.html
--- a/lib/python/TAL/tests/test7.xml
+++ b/lib/python/TAL/tests/test7.xml
--- a/lib/python/TAL/test/out8.html
+++ b/lib/python/TAL/test/out8.html
 <?xml version="1.0" ?>
-<table xmlns:m="http://xml.zope.org/namespaces/metal" m:use-macro="test/test7.xml/myTable">
+<table xmlns:m="http://xml.zope.org/namespaces/metal" m:use-macro="test/input/test7.xml/myTable">
 <!-- macro definition with slots -->
  <tr>
    <td>Top Left</td>

--- a/lib/python/TAL/test/out8.xml
+++ b/lib/python/TAL/test/out8.xml
 <?xml version="1.0" ?>
-<table xmlns:m="http://xml.zope.org/namespaces/metal" m:use-macro="test/test7.xml/myTable">
+<table xmlns:m="http://xml.zope.org/namespaces/metal" m:use-macro="test/input/test7.xml/myTable">
 <!-- macro definition with slots -->
  <tr>
    <td>Top Left</td>

--- a/lib/python/TAL/test/out9.html
+++ b/lib/python/TAL/test/out9.html
--- a/lib/python/TAL/tests/test1.html
+++ b/lib/python/TAL/tests/test1.html
--- a/lib/python/TAL/tests/test1.xml
+++ b/lib/python/TAL/tests/test1.xml
--- a/lib/python/TAL/tests/test2.html
+++ b/lib/python/TAL/tests/test2.html
--- a/lib/python/TAL/test/out2.xml
+++ b/lib/python/TAL/test/out2.xml
--- a/lib/python/TAL/tests/test3.html
+++ b/lib/python/TAL/tests/test3.html
--- a/lib/python/TAL/tests/test3.xml
+++ b/lib/python/TAL/tests/test3.xml
--- a/lib/python/TAL/tests/test4.html
+++ b/lib/python/TAL/tests/test4.html
--- a/lib/python/TAL/tests/test4.xml
+++ b/lib/python/TAL/tests/test4.xml
--- a/lib/python/TAL/test/out5.html
+++ b/lib/python/TAL/test/out5.html
--- a/lib/python/TAL/test/out5.xml
+++ b/lib/python/TAL/test/out5.xml
--- a/lib/python/TAL/tests/test6.html
+++ b/lib/python/TAL/tests/test6.html
 <?xml version="1.0" ?>
 <html>
  <body xmlns:m="http://xml.zope.org/namespaces/metal"
-        m:use-macro="test/test5.xml/body">
+        m:use-macro="test/input/test5.xml/body">
    dummy body in test6
  </body>
 </html>
--- a/lib/python/TAL/tests/test6.xml
+++ b/lib/python/TAL/tests/test6.xml
 <?xml version="1.0" ?>
 <html>
  <body xmlns:m="http://xml.zope.org/namespaces/metal"
-        m:use-macro="test/test5.xml/body">
+        m:use-macro="test/input/test5.xml/body">
    dummy body in test6
  </body>
 </html>
--- a/lib/python/TAL/test/out7.html
+++ b/lib/python/TAL/test/out7.html
--- a/lib/python/TAL/test/out7.xml
+++ b/lib/python/TAL/test/out7.xml
--- a/lib/python/TAL/test/test8.html
+++ b/lib/python/TAL/test/test8.html
 <?xml version="1.0" ?>
-<table xmlns:m="http://xml.zope.org/namespaces/metal" m:use-macro="test/test7.xml/myTable">
+<table xmlns:m="http://xml.zope.org/namespaces/metal" m:use-macro="test/input/test7.xml/myTable">
 <!-- macro use with slots -->
  <tr>
    <td>

--- a/lib/python/TAL/test/test8.xml
+++ b/lib/python/TAL/test/test8.xml
 <?xml version="1.0" ?>
-<table xmlns:m="http://xml.zope.org/namespaces/metal" m:use-macro="test/test7.xml/myTable">
+<table xmlns:m="http://xml.zope.org/namespaces/metal" m:use-macro="test/input/test7.xml/myTable">
 <!-- macro use with slots -->
  <tr>
    <td>

--- a/lib/python/TAL/tests/test9.html
+++ b/lib/python/TAL/tests/test9.html
--- a/lib/python/TAL/tests/out1.html
+++ b/lib/python/TAL/tests/out1.html
--- a/lib/python/TAL/tests/out1.xml
+++ b/lib/python/TAL/tests/out1.xml
--- a/lib/python/TAL/tests/out2.html
+++ b/lib/python/TAL/tests/out2.html
--- a/lib/python/TAL/tests/out2.xml
+++ b/lib/python/TAL/tests/out2.xml
--- a/lib/python/TAL/tests/out3.html
+++ b/lib/python/TAL/tests/out3.html
--- a/lib/python/TAL/tests/out3.xml
+++ b/lib/python/TAL/tests/out3.xml
--- a/lib/python/TAL/tests/out4.html
+++ b/lib/python/TAL/tests/out4.html
--- a/lib/python/TAL/tests/out4.xml
+++ b/lib/python/TAL/tests/out4.xml
--- a/lib/python/TAL/tests/out5.html
+++ b/lib/python/TAL/tests/out5.html
--- a/lib/python/TAL/tests/out5.xml
+++ b/lib/python/TAL/tests/out5.xml
--- a/lib/python/TAL/tests/out6.html
+++ b/lib/python/TAL/tests/out6.html
 <?xml version="1.0" ?>
 <html>
-  <body xmlns:m="http://xml.zope.org/namespaces/metal" m:use-macro="test/test5.xml/body">
+  <body xmlns:m="http://xml.zope.org/namespaces/metal" m:use-macro="test/input/test5.xml/body">

    <h1>This is the body of test5</h1>


--- a/lib/python/TAL/tests/out6.xml
+++ b/lib/python/TAL/tests/out6.xml
 <?xml version="1.0" ?>
 <html>
-  <body xmlns:m="http://xml.zope.org/namespaces/metal" m:use-macro="test/test5.xml/body">
+  <body xmlns:m="http://xml.zope.org/namespaces/metal" m:use-macro="test/input/test5.xml/body">

    <h1>This is the body of test5</h1>


--- a/lib/python/TAL/tests/out7.html
+++ b/lib/python/TAL/tests/out7.html
--- a/lib/python/TAL/tests/out7.xml
+++ b/lib/python/TAL/tests/out7.xml
--- a/lib/python/TAL/tests/out8.xml
+++ b/lib/python/TAL/tests/out8.xml
 <?xml version="1.0" ?>
-<table xmlns:m="http://xml.zope.org/namespaces/metal" m:use-macro="test/test7.xml/myTable">
+<table xmlns:m="http://xml.zope.org/namespaces/metal" m:use-macro="test/input/test7.xml/myTable">
 <!-- macro definition with slots -->
  <tr>
    <td>Top Left</td>

--- a/lib/python/TAL/tests/out8.html
+++ b/lib/python/TAL/tests/out8.html
 <?xml version="1.0" ?>
-<table xmlns:m="http://xml.zope.org/namespaces/metal" m:use-macro="test/test7.xml/myTable">
+<table xmlns:m="http://xml.zope.org/namespaces/metal" m:use-macro="test/input/test7.xml/myTable">
 <!-- macro definition with slots -->
  <tr>
    <td>Top Left</td>

--- a/lib/python/TAL/tests/out9.html
+++ b/lib/python/TAL/tests/out9.html