update some tests with new expectations

- conda is not importable in the frontmost python
- sys.executable is in $NB_PYTHON_PREFIX (this was true before, but it's value has changed)

Author: minrk

tests/conda/binder-dir/verify

@@ -1,8 +1,10 @@
 #!/usr/bin/env python
 import sys
+from subprocess import check_output
 
 assert sys.version_info[:2] == (3, 5), sys.version
 
+out = check_output(['conda', '--version']).decode('utf8').strip()
+assert out == 'conda 4.5.11', out
+
 import numpy
-import conda
-assert conda.__version__ == '4.5.11', conda.__version__

tests/conda/repo-path/verify

@@ -3,7 +3,7 @@ import sys
 import os
 
 # Python should still be in /srv/conda
-assert sys.executable == '/srv/conda/bin/python'
+assert sys.executable == os.path.join(os.environ['NB_PYTHON_PREFIX'], 'bin', 'python')
 
 # Repo should be in /srv/repo
 assert os.path.exists('/srv/repo/verify')

tests/conda/simple-py2/verify

@@ -13,7 +13,7 @@ assert sorted(specs) == ['python2', 'python3'], specs.keys()
 import json
 from subprocess import check_output
 envs = json.loads(check_output(['conda', 'env', 'list', '--json']).decode('utf8'))
-assert envs == {'envs': ['/srv/conda', '/srv/conda/envs/kernel']}, envs
+assert envs == {'envs': ['/srv/conda', '/srv/conda/envs/kernel', '/srv/conda/envs/notebook']}, envs
 
 pkgs = json.loads(check_output(['conda', 'list', '-n', 'kernel', '--json']).decode('utf8'))
 pkg_names = [pkg['name'] for pkg in pkgs]