Commit 7eeb7603 authored by Fred Drake's avatar Fred Drake

- setUp(): cache the loaded schema so we only need to load it once

- test_path(): make this test pass; the "path" configuration field
  requires that the paths actually exist
parent 56f0ac18
......@@ -36,8 +36,12 @@ def getSchema():
return ZConfig.loadSchema(schemafile)
class StartupTestCase(unittest.TestCase):
schema = None
def setUp(self):
self.schema = getSchema()
if self.schema is None:
StartupTestCase.schema = getSchema()
def load_config_text(self, text):
# We have to create a directory of our own since the existence
......@@ -92,14 +96,24 @@ class StartupTestCase(unittest.TestCase):
self.assertEqual(items, [("FEARFACTORY", "rocks"), ("NSYNC","doesnt")])
def test_path(self):
p1 = tempfile.mktemp()
p2 = tempfile.mktemp()
try:
os.mkdir(p1)
os.mkdir(p2)
conf, handler = self.load_config_text("""\
# instancehome is here since it's required
instancehome <<INSTANCE_HOME>>
path /foo/bar
path /baz/bee
""")
path %s
path %s
""" % (p1, p2))
items = conf.path
self.assertEqual(items, ['/foo/bar', '/baz/bee'])
self.assertEqual(items, [p1, p2])
finally:
if os.path.exists(p1):
os.rmdir(p1)
if os.path.exists(p2):
os.rmdir(p2)
def test_access_and_trace_logs(self):
fn = tempfile.mktemp()
......
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