Merge pull request #458 from joerick/logger

Improve CI logs using fold groups

test/test_0_basic.py

@@ -1,7 +1,9 @@
-import textwrap
 import platform
-from . import test_projects
-from . import utils
+import textwrap
+import pytest
+
+from cibuildwheel.logger import Logger
+from . import test_projects, utils
 
 basic_project = test_projects.new_c_project(
     setup_py_add=textwrap.dedent('''
@@ -25,6 +27,22 @@ def test(tmp_path):
     assert set(actual_wheels) == set(expected_wheels)
 
 
+@pytest.mark.skip(reason='to keep test output clean')
+def test_sample_build(tmp_path, capfd):
+    project_dir = tmp_path / 'project'
+    basic_project.generate(project_dir)
+
+    # build the wheels, and let the output passthrough to the caller, so
+    # we can see how it looks
+    with capfd.disabled():
+        logger = Logger()
+        logger.step('test_sample_build')
+        try:
+            utils.cibuildwheel_run(project_dir)
+        finally:
+            logger.step_end()
+
+
 def test_build_identifiers(tmp_path):
     project_dir = tmp_path / 'project'
     basic_project.generate(project_dir)

test/test_projects/__main__.py

@@ -11,27 +11,34 @@ def main():
         prog="python -m test.test_projects",
         description='Generate a test project to check it out'
     )
+    parser.add_argument('--open', action='store_true', help='''
+        Open the generated project in a file explorer
+    ''')
     parser.add_argument('PROJECT', help='''
         Python path to a project object. E.g. test.test_0_basic.basic_project
     ''')
+    parser.add_argument('OUTPUT', nargs='?', help='''
+        Path to output dir. If no dir is passed, a tempdir will be generated.
+    ''')
     options = parser.parse_args()
 
     module, _, name = options.PROJECT.rpartition('.')
 
     project = getattr(importlib.import_module(module), name)
 
-    project_dir = Path(tempfile.mkdtemp())
+    project_dir = Path(options.OUTPUT or tempfile.mkdtemp())
     project.generate(project_dir)
 
     print('Project generated at', project_dir)
     print()
 
-    if sys.platform == 'darwin':
-        subprocess.check_call(['open', '--', project_dir])
-    elif sys.platform == 'linux2':
-        subprocess.check_call(['xdg-open', '--', project_dir])
-    elif sys.platform == 'win32':
-        subprocess.check_call(['explorer', project_dir])
+    if options.open:
+        if sys.platform == 'darwin':
+            subprocess.check_call(['open', '--', project_dir])
+        elif sys.platform == 'linux2':
+            subprocess.check_call(['xdg-open', '--', project_dir])
+        elif sys.platform == 'win32':
+            subprocess.check_call(['explorer', project_dir])
 
 
 if __name__ == '__main__':

test/test_testing.py

@@ -103,15 +103,26 @@ def test_extras_require(tmp_path):
     assert set(actual_wheels) == set(expected_wheels)
 
 
+project_with_a_failing_test = test_projects.new_c_project()
+project_with_a_failing_test.files['test/spam_test.py'] = r'''
+from unittest import TestCase
+
+class TestSpam(TestCase):
+    def test_something(self):
+        self.fail('this test is supposed to fail')
+'''
+
+
 def test_failing_test(tmp_path):
     """Ensure a failing test causes cibuildwheel to error out and exit"""
     project_dir = tmp_path / 'project'
     output_dir = tmp_path / 'output'
-    project_with_a_test.generate(project_dir)
+    project_with_a_failing_test.generate(project_dir)
 
     with pytest.raises(subprocess.CalledProcessError):
         utils.cibuildwheel_run(project_dir, output_dir=output_dir, add_env={
-            'CIBW_TEST_COMMAND': 'false',
+            'CIBW_TEST_REQUIRES': 'nose',
+            'CIBW_TEST_COMMAND': 'nosetests {project}/test',
             # manylinux1 has a version of bash that's been shown to have
             # problems with this, so let's check that.
             'CIBW_MANYLINUX_I686_IMAGE': 'manylinux1',