Updates to CI and some small fixes

scripts/bootstrap-env

@@ -22,7 +22,7 @@ function normalize() {
 
 function usage() {
     script_name=$(basename "${BASH_SOURCE[0]}")
-    echo "Usage: $script_name [-v] <environment> <requirements>
+    echo "Usage: $script_name [-3] [-v] <environment> <requirements>
 
 Script for configuring and updating a virtualenv based Python environment.
 

scripts/test

@@ -25,7 +25,7 @@ cd "$ROOT"
 source "${VENV_DIR}/bin/activate" || exit 1
 
 # Clear out any previous coverage data.
-if [ -d .coverage ]; then
+if [ -f .coverage ]; then
     rm -f .coverage
 fi
 

streamedinput.py

@@ -178,7 +178,7 @@ class StreamedInput(object):
             outputfds = []
             exceptfds = [self.proc.stdout]
 
-            while self.proc.poll() is None and not self.stop_issued:
+            while self.proc.poll() is None:
                 readable, _, exceptional = select.select(inputfds, outputfds, exceptfds)
                 if readable:
                     self._receive_from_subprocess()

streamedinput_test.py

@@ -527,4 +527,5 @@ if __name__ == '__main__':
     __name__ = os.path.basename(sys.argv[0][:-3])  # pylint: disable=redefined-builtin
     env = os.environ
     env['NOSE_WITH_XUNIT'] = '1'
+    env['NOSE_VERBOSE'] = '1'
     exit(nose.runmodule(env=env))