Skip to content

Commit

Permalink
isolate test
Browse files Browse the repository at this point in the history
Signed-off-by: Kale Franz <[email protected]>
  • Loading branch information
kalefranz committed Jun 15, 2018
1 parent 2fdfc63 commit 55d082f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
3 changes: 1 addition & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ build: false

test_script:
- CALL dev-init.bat
- py.test %ADD_COV% -m "not integration and not installed" -v
- py.test %ADD_COV% --cov-append -m "integration and not installed" -v
- py.test %ADD_COV% --cov-append -m "integration and not installed" -vv -k test_bash_basic_integration
- codecov --env PYTHON_VERSION --required
- python -m conda.common.io
3 changes: 1 addition & 2 deletions tests/test_activate.py
Original file line number Diff line number Diff line change
Expand Up @@ -1166,6 +1166,7 @@ def __enter__(self):
PATH = joiner(self.activator.path_conversion(concatv(
(dirname(sys.executable),),
self.activator._get_starting_path_list(),
(which(self.shell_name),),
)))
self.original_path = PATH
env.update({
Expand All @@ -1174,8 +1175,6 @@ def __enter__(self):
'PATH': PATH,
})
env = {str(k): str(v) for k, v in iteritems(env)}
# for name, val in env.items():
# p.sendline(self.activator.export_var_tmpl % (name, val))

p = PopenSpawn(self.shell_name, timeout=12, maxread=2000, searchwindowsize=None,
logfile=sys.stdout, cwd=os.getcwd(), env=env, encoding=None,
Expand Down

0 comments on commit 55d082f

Please sign in to comment.