Commit 52972b0c authored by Julien Muchembled's avatar Julien Muchembled

Fix testing index when /bin/sh is dash (like on Debian)

Contrary to bash, dash filters out environment variables
containing '-' characters.
parent eb27c486
...@@ -62,7 +62,7 @@ except ImportError: ...@@ -62,7 +62,7 @@ except ImportError:
from urlparse import urljoin from urlparse import urljoin
default_index_url = os.environ.get( default_index_url = os.environ.get(
'buildout-testing-index-url', 'BUILDOUT_TESTING_INDEX_URL',
'https://pypi.python.org/simple', 'https://pypi.python.org/simple',
) )
......
...@@ -224,7 +224,7 @@ def buildoutSetUp(test): ...@@ -224,7 +224,7 @@ def buildoutSetUp(test):
register_teardown(lambda: rmtree(tmp)) register_teardown(lambda: rmtree(tmp))
zc.buildout.easy_install.default_index_url = 'file://'+tmp zc.buildout.easy_install.default_index_url = 'file://'+tmp
os.environ['buildout-testing-index-url'] = ( os.environ['BUILDOUT_TESTING_INDEX_URL'] = (
zc.buildout.easy_install.default_index_url) zc.buildout.easy_install.default_index_url)
def tmpdir(name): def tmpdir(name):
......
...@@ -3352,7 +3352,7 @@ def easy_install_SetUp(test): ...@@ -3352,7 +3352,7 @@ def easy_install_SetUp(test):
def buildout_txt_setup(test): def buildout_txt_setup(test):
zc.buildout.testing.buildoutSetUp(test) zc.buildout.testing.buildoutSetUp(test)
mkdir = test.globs['mkdir'] mkdir = test.globs['mkdir']
eggs = os.environ['buildout-testing-index-url'][7:] eggs = os.environ['BUILDOUT_TESTING_INDEX_URL'][7:]
test.globs['sample_eggs'] = eggs test.globs['sample_eggs'] = eggs
create_sample_eggs(test) create_sample_eggs(test)
......
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