Commit bfedbc34 authored by Xavier Thompson's avatar Xavier Thompson

[fix] zc.recipe.egg: Fix testing framework

parent 9f45ce37
...@@ -231,6 +231,12 @@ normalize_bang = ( ...@@ -231,6 +231,12 @@ normalize_bang = (
) )
normalize_S = (
re.compile(r'#!/usr/local/bin/python2.7 -S'),
'#!/usr/local/bin/python2.7',
)
def create_egg(name, version, dest, install_requires=None, def create_egg(name, version, dest, install_requires=None,
dependency_links=None): dependency_links=None):
d = tempfile.mkdtemp() d = tempfile.mkdtemp()
......
...@@ -32,7 +32,7 @@ import zc.buildout.easy_install ...@@ -32,7 +32,7 @@ import zc.buildout.easy_install
import zc.buildout.testing import zc.buildout.testing
import zipfile import zipfile
from zc.buildout.tests import easy_install_SetUp from zc.buildout.tests import easy_install_SetUp
from zc.buildout.tests import normalize_bang from zc.buildout.tests import normalize_bang, normalize_S
from zc.buildout.tests import create_egg from zc.buildout.tests import create_egg
from zc.buildout.tests import create_sample_eggs from zc.buildout.tests import create_sample_eggs
...@@ -3405,12 +3405,6 @@ def bootstrapSetup(test): ...@@ -3405,12 +3405,6 @@ def bootstrapSetup(test):
test.globs['bootstrap_py'] = bootstrap_py test.globs['bootstrap_py'] = bootstrap_py
normalize_S = (
re.compile(r'#!/usr/local/bin/python2.7 -S'),
'#!/usr/local/bin/python2.7',
)
def test_suite(): def test_suite():
test_suite = [ test_suite = [
......
...@@ -360,7 +360,7 @@ If a wrong script name is provided, buildout tells about it: ...@@ -360,7 +360,7 @@ If a wrong script name is provided, buildout tells about it:
... scripts = undefined ... scripts = undefined
... """ % dict(server=link_server)) ... """ % dict(server=link_server))
>>> print system(buildout), >>> print_(system(buildout))
Uninstalling demo. Uninstalling demo.
Installing demo. Installing demo.
Could not generate script 'undefined' as it is not defined in the egg entry points. Could not generate script 'undefined' as it is not defined in the egg entry points.
...@@ -380,7 +380,7 @@ If a wrong script name is provided, buildout tells about it: ...@@ -380,7 +380,7 @@ If a wrong script name is provided, buildout tells about it:
... scripts = foo=undefined ... scripts = foo=undefined
... """ % dict(server=link_server)) ... """ % dict(server=link_server))
>>> print system(buildout), >>> print_(system(buildout))
Uninstalling demo. Uninstalling demo.
Installing demo. Installing demo.
Could not generate script 'foo' as script 'undefined' is not defined in the egg entry points. Could not generate script 'foo' as script 'undefined' is not defined in the egg entry points.
......
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