Skip to content

Z
Zope
Commit 9a27d058 authored by Fred Drake's avatar Fred Drake
Browse files
Options

Move all the test input/output files around so the test/ directory is 

available for Zope-style regression tests; these will appear later.
parent ab80f6d3
Show whitespace changes
Inline Side-by-side
Showing with 21 additions and 21 deletions
lib/python/TAL/driver.py
View file @ 9a27d058
...@@ -102,7 +102,7 @@ except ImportError: ...@@ -102,7 +102,7 @@ except ImportError:
# Import local classes # Import local classes
from DummyEngine import DummyEngine from DummyEngine import DummyEngine
FILE = "test/test1.xml" FILE = "test/input/test1.xml"
def main(): def main():
versionTest = 1 versionTest = 1
...@@ -116,7 +116,7 @@ def main(): ...@@ -116,7 +116,7 @@ def main():
"usage: driver.py [-h|-x] [-m] [-n] [file]\n") "usage: driver.py [-h|-x] [-m] [-n] [file]\n")
sys.stderr.write("-h/-x -- HTML/XML input (default auto)\n") sys.stderr.write("-h/-x -- HTML/XML input (default auto)\n")
sys.stderr.write("-m -- macro expansion only\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) sys.exit(2)
for o, a in opts: for o, a in opts:
if o == '-h': if o == '-h':
......
lib/python/TAL/runtest.py
View file @ 9a27d058
...@@ -125,7 +125,7 @@ def main(): ...@@ -125,7 +125,7 @@ def main():
opts.append(args[0]) opts.append(args[0])
del args[0] del args[0]
if not args: if not args:
prefix = os.path.join("test", "test*.") prefix = os.path.join("test", "input", "test*.")
xmlargs = glob.glob(prefix + "xml") xmlargs = glob.glob(prefix + "xml")
xmlargs.sort() xmlargs.sort()
htmlargs = glob.glob(prefix + "html") htmlargs = glob.glob(prefix + "html")
...@@ -157,8 +157,8 @@ def main(): ...@@ -157,8 +157,8 @@ def main():
continue continue
head, tail = os.path.split(arg) head, tail = os.path.split(arg)
outfile = os.path.join( outfile = os.path.join(
head, string.replace(head, "input", "output"),
string.replace(tail, "test", "out")) tail)
try: try:
f = open(outfile) f = open(outfile)
except IOError: except IOError:
......
lib/python/TAL/test/test6.html → lib/python/TAL/test/input/test6.html
View file @ 9a27d058
<?xml version="1.0" ?> <?xml version="1.0" ?>
<html> <html>
<body xmlns:m="http://xml.zope.org/namespaces/metal" <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 dummy body in test6
</body> </body>
</html> </html>
lib/python/TAL/test/test6.xml → lib/python/TAL/test/input/test6.xml
View file @ 9a27d058
<?xml version="1.0" ?> <?xml version="1.0" ?>
<html> <html>
<body xmlns:m="http://xml.zope.org/namespaces/metal" <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 dummy body in test6
</body> </body>
</html> </html>
lib/python/TAL/tests/test8.html → lib/python/TAL/test/input/test8.html
View file @ 9a27d058
<?xml version="1.0" ?> <?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 --> <!-- macro use with slots -->
<tr> <tr>
<td> <td>
......
lib/python/TAL/tests/test8.xml → lib/python/TAL/test/input/test8.xml
View file @ 9a27d058
<?xml version="1.0" ?> <?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 --> <!-- macro use with slots -->
<tr> <tr>
<td> <td>
......
lib/python/TAL/test/out6.html → lib/python/TAL/test/output/test6.html
View file @ 9a27d058
<?xml version="1.0" ?> <?xml version="1.0" ?>
<html> <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> <h1>This is the body of test5</h1>
......
lib/python/TAL/test/out6.xml → lib/python/TAL/test/output/test6.xml
View file @ 9a27d058
<?xml version="1.0" ?> <?xml version="1.0" ?>
<html> <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> <h1>This is the body of test5</h1>
......
lib/python/TAL/test/out8.html → lib/python/TAL/test/output/test8.html
View file @ 9a27d058
<?xml version="1.0" ?> <?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 --> <!-- macro definition with slots -->
<tr> <tr>
<td>Top Left</td> <td>Top Left</td>
......
lib/python/TAL/test/out8.xml → lib/python/TAL/test/output/test8.xml
View file @ 9a27d058
<?xml version="1.0" ?> <?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 --> <!-- macro definition with slots -->
<tr> <tr>
<td>Top Left</td> <td>Top Left</td>
......
lib/python/TAL/tests/test6.html → lib/python/TAL/tests/input/test6.html
View file @ 9a27d058
<?xml version="1.0" ?> <?xml version="1.0" ?>
<html> <html>
<body xmlns:m="http://xml.zope.org/namespaces/metal" <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 dummy body in test6
</body> </body>
</html> </html>
lib/python/TAL/tests/test6.xml → lib/python/TAL/tests/input/test6.xml
View file @ 9a27d058
<?xml version="1.0" ?> <?xml version="1.0" ?>
<html> <html>
<body xmlns:m="http://xml.zope.org/namespaces/metal" <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 dummy body in test6
</body> </body>
</html> </html>
lib/python/TAL/test/test8.html → lib/python/TAL/tests/input/test8.html
View file @ 9a27d058
<?xml version="1.0" ?> <?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 --> <!-- macro use with slots -->
<tr> <tr>
<td> <td>
......
lib/python/TAL/test/test8.xml → lib/python/TAL/tests/input/test8.xml
View file @ 9a27d058
<?xml version="1.0" ?> <?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 --> <!-- macro use with slots -->
<tr> <tr>
<td> <td>
......
lib/python/TAL/tests/out6.html → lib/python/TAL/tests/output/test6.html
View file @ 9a27d058
<?xml version="1.0" ?> <?xml version="1.0" ?>
<html> <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> <h1>This is the body of test5</h1>
......
lib/python/TAL/tests/out6.xml → lib/python/TAL/tests/output/test6.xml
View file @ 9a27d058
<?xml version="1.0" ?> <?xml version="1.0" ?>
<html> <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> <h1>This is the body of test5</h1>
......
lib/python/TAL/tests/out8.xml → lib/python/TAL/tests/output/test8.html
View file @ 9a27d058
<?xml version="1.0" ?> <?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 --> <!-- macro definition with slots -->
<tr> <tr>
<td>Top Left</td> <td>Top Left</td>
......
lib/python/TAL/tests/out8.html → lib/python/TAL/tests/output/test8.xml
View file @ 9a27d058
<?xml version="1.0" ?> <?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 --> <!-- macro definition with slots -->
<tr> <tr>
<td>Top Left</td> <td>Top Left</td>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7