Commit 6df68fc8 authored by Ivan Tyagov's avatar Ivan Tyagov

Pass if available IPYTHONDIR location so some tests can call Jupyter

kernel.
parent 4dd645f1
...@@ -62,6 +62,7 @@ class Recipe(GenericBaseRecipe): ...@@ -62,6 +62,7 @@ class Recipe(GenericBaseRecipe):
memcached_parsed = urlparse.urlparse(self.options['memcached-url']) memcached_parsed = urlparse.urlparse(self.options['memcached-url'])
kumofs_parsed = urlparse.urlparse(self.options['kumofs-url']) kumofs_parsed = urlparse.urlparse(self.options['kumofs-url'])
common_dict = dict( common_dict = dict(
IPYTHONDIR = self.options["ipython-dir"],
instance_home=testinstance, instance_home=testinstance,
prepend_path=self.options['prepend-path'], prepend_path=self.options['prepend-path'],
openssl_binary=self.options['openssl-binary'], openssl_binary=self.options['openssl-binary'],
......
...@@ -29,6 +29,8 @@ import sys ...@@ -29,6 +29,8 @@ import sys
def runTestSuite(args, d): def runTestSuite(args, d):
env = os.environ.copy() env = os.environ.copy()
if "IPYTHONDIR" in d:
env["IPYTHONDIR"] = d["IPYTHONDIR"]
if 'openssl_binary' in d: if 'openssl_binary' in d:
env['OPENSSL_BINARY'] = d['openssl_binary'] env['OPENSSL_BINARY'] = d['openssl_binary']
if 'test_ca_path' in d: if 'test_ca_path' in d:
......
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