Commit a12ff7a0 authored by Jim Fulton's avatar Jim Fulton

Used new API for test server management

parent e28ce870
...@@ -66,14 +66,7 @@ It is an error to create a variable-reference cycle: ...@@ -66,14 +66,7 @@ It is an error to create a variable-reference cycle:
def linkerSetUp(test): def linkerSetUp(test):
zc.buildout.testing.buildoutSetUp(test, clear_home=False) zc.buildout.testing.buildoutSetUp(test, clear_home=False)
zc.buildout.testing.multi_python(test) zc.buildout.testing.multi_python(test)
test.globs['link_server'] = ( zc.buildout.testing.setUpServer(test, zc.buildout.testing.make_tree(test))
'http://localhost:%s/'
% zc.buildout.testing.start_server(zc.buildout.testing.make_tree(test))
)
def linkerTearDown(test):
zc.buildout.testing.buildoutTearDown(test)
zc.buildout.testing.stop_server(test.globs['link_server'])
class PythonNormalizing(renormalizing.RENormalizing): class PythonNormalizing(renormalizing.RENormalizing):
...@@ -149,7 +142,7 @@ def test_suite(): ...@@ -149,7 +142,7 @@ def test_suite():
doctest.DocFileSuite( doctest.DocFileSuite(
'easy_install.txt', 'easy_install.txt',
setUp=linkerSetUp, tearDown=linkerTearDown, setUp=linkerSetUp, tearDown=zc.buildout.testing.buildoutTearDown,
checker=PythonNormalizing([ checker=PythonNormalizing([
(re.compile("'%(sep)s\S+sample-install%(sep)s(dist%(sep)s)?" (re.compile("'%(sep)s\S+sample-install%(sep)s(dist%(sep)s)?"
......
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