Rework custom test machinery to give the individual tests more control

on how they're run, and combine environment.json and check.py

test/05_environment/check.py

@@ -1,9 +0,0 @@
-import glob
-import subprocess
-import sys
-
-build_identifiers = subprocess.check_output([sys.executable, '-m', 'cibuildwheel', '--print-build-identifiers'], universal_newlines=True).strip().split('\n')
-expected_identifiers = build_identifiers
-built_wheels = glob.glob('wheelhouse/*.whl')
-
-assert len(built_wheels) == len(expected_identifiers)

test/05_environment/cibuildwheel_test.py

@@ -0,0 +1,22 @@
+import subprocess, sys, os
+from glob import glob
+project_dir = os.path.dirname(__file__)
+sys.path.append(os.path.join(os.path.dirname(project_dir), 'shared'))
+import utils
+
+def test():
+    # set up the environment
+    env = os.environ.copy()
+    # write some information into the CIBW_ENVIRONMENT, for expansion and
+    # insertion into the environment by cibuildwheel. This is checked
+    # in setup.py
+    env['CIBW_ENVIRONMENT'] = 'CIBW_TEST_VAR="a b c" CIBW_TEST_VAR_2=1 CIBW_TEST_VAR_3="$(echo \'test string 3\')" PATH=$PATH:/opt/cibw_test_path',
+    env['CIBW_ENVIRONMENT_WINDOWS'] = 'CIBW_TEST_VAR="a b c" CIBW_TEST_VAR_2=1 CIBW_TEST_VAR_3="$(echo \'test string 3\')" PATH="$PATH;/opt/cibw_test_path"'
+
+    # build the wheels
+    subprocess.check_call([sys.executable, '-m', 'cibuildwheel', project_dir], env=env)
+    
+    # check that we got the right number of built wheels
+    expected_identifiers = utils.cibuildwheel_get_build_identifiers(project_dir)
+    built_wheels = glob('wheelhouse/*.whl')
+    assert len(built_wheels) == len(expected_identifiers)

test/05_environment/environment.json

@@ -1,4 +0,0 @@
-{
-    "CIBW_ENVIRONMENT": "CIBW_TEST_VAR=\"a b c\" CIBW_TEST_VAR_2=1 CIBW_TEST_VAR_3=\"$(echo 'test string 3')\" PATH=$PATH:/opt/cibw_test_path",
-    "CIBW_ENVIRONMENT_WINDOWS": "CIBW_TEST_VAR=\"a b c\" CIBW_TEST_VAR_2=1 CIBW_TEST_VAR_3=\"$(echo 'test string 3')\" PATH=\"$PATH;/opt/cibw_test_path\""
-}

test/05_environment/version.txt

@@ -1,2 +0,0 @@
-3.6.0 (default, Feb  7 2017, 23:55:32) 
-[GCC 4.8.2 20140120 (Red Hat 4.8.2-15)]