Tackle comments + some tweaks

lesteve · lesteve · commit eb024104efe0 · 2017-11-13T10:49:27.000+01:00
diff --git a/build_tools/travis/test_script.sh b/build_tools/travis/test_script.sh
@@ -61,10 +61,11 @@ if [[ "$SKIP_TESTS" != "true" ]]; then
 fi
 
 if [[ "$CHECK_PYTEST_SOFT_DEPENDENCY" == "true" ]]; then
-    conda remove -y py pytest || echo "pytest not found by conda"
-    pip uninstall -y py pytest || echo "pytest not found by pip"
+    conda remove -y py pytest || pip uninstall -y py pytest
     if [[ "$COVERAGE" == "true" ]]; then
-        CMD="coverage run -a"
+        # Need to append the coverage to the existing .coverage generated by
+        # running the tests
+        CMD="coverage run --append"
     else
         CMD="python"
     fi
diff --git a/sklearn/utils/tests/test_estimator_checks.py b/sklearn/utils/tests/test_estimator_checks.py
@@ -256,7 +256,9 @@ def __init__(self):
                         NonConformantEstimator)
 
 
-if __name__ == '__main__':
+def run_tests_without_pytest():
+    """Runs the tests in this file without using pytest.
+    """
     main_module = sys.modules['__main__']
     test_functions = [getattr(main_module, name) for name in dir(main_module)
                       if name.startswith('test_')]
@@ -265,3 +267,9 @@ def __init__(self):
     suite.addTests(test_cases)
     runner = unittest.TextTestRunner()
     runner.run(suite)
+
+
+if __name__ == '__main__':
+    # This module is run as a script to check that we have no dependency on
+    # pytest for estimator checks.
+    run_tests_without_pytest()
