Merge branch 'bugfix-virtualenv' into freebsd-support

pexpect · Apr 25, 2015 · 2d35bba · 2d35bba
2 parents a93fea6 + 71bbdf5
commit 2d35bba
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/requirements-testing.txt b/requirements-testing.txt
@@ -0,0 +1,5 @@
+pytest
+pytest-cov
+coverage
+coveralls
+pytest-capturelog
diff --git a/tools/teamcity-runtests.sh b/tools/teamcity-runtests.sh
@@ -27,7 +27,8 @@ fi
 
 . ${venv_wrapper}
 rmvirtualenv ${venv} || true
-mkvirtualenv -p `which python${pyversion}` ${venv}
+mkvirtualenv -p `which python${pyversion}` ${venv} || true
+workon ${venv}
 
 # install ptyprocess
 cd $here/../../ptyprocess