Merge pull request #596 from EducationalTestingService/make-test-examples-testable-for-pkgs

Improve testability of `test_examples.py`.

Author: desilinguist

tests/test_examples.py

@@ -9,8 +9,8 @@
 import subprocess
 
 from glob import glob
-from os import getcwd, makedirs
-from os.path import abspath, basename, dirname, exists, join
+from os import environ, getcwd, makedirs
+from os.path import abspath, basename, dirname, exists, join, normpath
 from shutil import copytree, copyfile, rmtree
 
 from nose.tools import eq_, assert_almost_equal
@@ -20,7 +20,7 @@
 
 _my_cwd = getcwd()
 _my_dir = abspath(dirname(__file__))
-_examples_dir = join(_my_dir, '..', 'examples')
+_examples_dir = normpath(join(_my_dir, '..', 'examples'))
 
 _old_titanic_dir = join(_examples_dir, 'titanic')
 _old_boston_dir = join(_examples_dir, 'boston')
@@ -30,6 +30,13 @@
 _new_boston_dir = join(_my_dir, 'other', 'boston')
 _new_iris_dir = join(_my_dir, 'other', 'iris')
 
+# if we are running the tests without activating the conda
+# environment (as we do when testing the conda and TestPyPI
+# packages), then we will usually pass in a BINDIR environment
+# variable that points to where the environment's `bin` directory
+# is located
+_binary_dir = environ.get('BINDIR', '')
+
 
 def run_configuration_and_check_outputs(config_path):
     """
@@ -90,11 +97,12 @@ def setup():
     copytree(_old_titanic_dir, _new_titanic_dir)
 
     # Create all of the data sets we need
-    subprocess.run(['python', join(_examples_dir, 'make_titanic_example_data.py')],
+    python_binary = join(_binary_dir, 'python') if _binary_dir else 'python'
+    subprocess.run([python_binary, join(_examples_dir, 'make_titanic_example_data.py')],
                    cwd=dirname(_new_titanic_dir))
-    subprocess.run(['python', join(_examples_dir, 'make_boston_example_data.py')],
+    subprocess.run([python_binary, join(_examples_dir, 'make_boston_example_data.py')],
                    cwd=dirname(_new_boston_dir))
-    subprocess.run(['python', join(_examples_dir, 'make_iris_example_data.py')],
+    subprocess.run([python_binary, join(_examples_dir, 'make_iris_example_data.py')],
                    cwd=dirname(_new_iris_dir))
 
     # Move all the configuration files to our new directories

tests/test_input.py

@@ -14,7 +14,7 @@
 
 from glob import glob
 from itertools import product
-from os.path import abspath, dirname, exists, join, normpath
+from os.path import abspath, dirname, exists, join, normcase, normpath
 from shutil import rmtree
 
 import numpy as np
@@ -1141,7 +1141,8 @@ def test_config_parsing_relative_input_path():
      class_map, custom_learner_path, learning_curve_cv_folds_list,
      learning_curve_train_sizes, output_metrics) = _parse_config_file(config_path)
 
-    eq_(normpath(train_path), (join(_my_dir, 'train')))
+    # we need to use normcase here for Azure package builds to pass
+    eq_(normcase(normpath(train_path)), normcase(join(_my_dir, 'train')))
 
 
 def test_config_parsing_relative_input_paths():