Fix template in GHA (#57)

Author: nicoddemus

.github/workflows/main.yml

@@ -15,15 +15,15 @@ jobs:
         os: [ubuntu-latest]
         include:
           - python: "2.7"
-            tox_env: "py27"
+            tox_env: "py27-pytestlatest"
           - python: "3.5"
-            tox_env: "py35"
+            tox_env: "py35-pytestlatest"
           - python: "3.6"
-            tox_env: "py36"
+            tox_env: "py36-pytestlatest"
           - python: "3.7"
-            tox_env: "py37"
+            tox_env: "py37-pytestlatest"
           - python: "3.8"
-            tox_env: "py38"
+            tox_env: "py38-pytestlatest py38-pytest53"
 
     steps:
     - uses: actions/checkout@v1
@@ -33,21 +33,24 @@ jobs:
         python-version: ${{ matrix.python }}
     - name: Install GoogleTest
       run: |
-        wget https://github.com/google/googletest/archive/release-{{ matrix.gtest_ver }}.tar.gz
-        tar -zxvf release-{{ matrix.gtest_ver }}.tar.gz
-        cd googletest-release-{{ matrix.gtest_ver }}/googletest 
-        cmake . 
-        sudo make install        
+        wget https://github.com/google/googletest/archive/release-${{ matrix.gtest_ver }}.tar.gz
+        tar -zxvf release-${{ matrix.gtest_ver }}.tar.gz
+        cd googletest-release-${{ matrix.gtest_ver }}/googletest
+        cmake .
+        sudo make install
     - name: Install Boost.Test
       run: |
-        sudo apt-get install libboost-test-dev valgrind        
-    - name: Install Python Deps
+        sudo apt-get install libboost-test-dev valgrind
+    - name: Compile
       run: |
         python -m pip install --upgrade pip
-        pip install tox scons
+        pip install scons
+        scons -j4 -C tests
+    - name: Install Tox
+      run: |
+        pip install tox
     - name: Test
       run: |
-        scons -j4 -C tests
         tox -e ${{ matrix.tox_env }}
 
   linting:

.travis.yml

@@ -17,8 +17,8 @@ Supports both `Google Test <https://code.google.com/p/googletest>`_ and
 .. |anaconda| image:: https://img.shields.io/conda/vn/conda-forge/pytest-cpp.svg
     :target: https://anaconda.org/conda-forge/pytest-cpp
 
-.. |ci| image:: http://img.shields.io/travis/pytest-dev/pytest-cpp.png
-  :target: https://travis-ci.org/pytest-dev/pytest-cpp
+.. |ci| image:: https://github.com/pytest-dev/pytest-cpp/workflows/build/badge.svg
+    :target: https://github.com/pytest-dev/pytest-cpp/actions
 
 .. |coverage| image:: http://img.shields.io/coveralls/pytest-dev/pytest-cpp.png
   :target: https://coveralls.io/r/pytest-dev/pytest-cpp

README.rst

@@ -20,7 +20,7 @@ struct MyConfig {
 };
 
 // structure MyConfig is used as a global fixture - it's invoked pre and post any testing is performed
-BOOST_GLOBAL_FIXTURE( MyConfig )
+BOOST_TEST_GLOBAL_FIXTURE( MyConfig );
 
 //____________________________________________________________________________//
 

tests/acceptance/boosttest-samples/unit_test_example_09_1.cpp

@@ -21,7 +21,7 @@ struct MyConfig2 {
 };
 
 // structure MyConfig2 is used as a global fixture. You could have any number of global fxtures
-BOOST_GLOBAL_FIXTURE( MyConfig2 )
+BOOST_TEST_GLOBAL_FIXTURE( MyConfig2 );
 
 //____________________________________________________________________________//
 

tests/acceptance/boosttest-samples/unit_test_example_09_2.cpp

@@ -129,10 +129,10 @@ def test_boost_failure(exes):
 
     fail1, fail2 = failures
     colors = ("red", "bold")
-    assert fail1.get_lines() == [("check 2 * 3 == 5 failed", colors)]
+    assert fail1.get_lines() == [("check 2 * 3 == 5 has failed", colors)]
     assert fail1.get_file_reference() == ("boost_failure.cpp", 9)
 
-    assert fail2.get_lines() == [("check 2 - 1 == 0 failed", colors)]
+    assert fail2.get_lines() == [("check 2 - 1 == 0 has failed", colors)]
     assert fail2.get_file_reference() == ("boost_failure.cpp", 15)
 
 
@@ -143,7 +143,7 @@ def test_boost_fatal_error(exes):
 
     (fail1,) = failures
     colors = ("red", "bold")
-    assert fail1.get_lines() == [("critical check 2 * 3 == 5 failed", colors)]
+    assert fail1.get_lines() == [("critical check 2 * 3 == 5 has failed", colors)]
     assert fail1.get_file_reference() == ("boost_fatal_error.cpp", 8)
 
 
@@ -170,12 +170,9 @@ def test_boost_fixture_setup_error(exes):
 
     fail1 = failures[0]
     colors = ("red", "bold")
-    assert fail1.get_lines() == [
-        (
-            "Test setup error: std::runtime_error: This is a global fixture init failure",
-            colors,
-        )
-    ]
+    ((line, obtained_colors),) = fail1.get_lines()
+    assert line.startswith("Test setup error")
+    assert obtained_colors == colors
     assert fail1.get_file_reference() == ("unknown location", 0)
 
 

tests/test_pytest_cpp.py

@@ -1,5 +1,5 @@
 [tox]
-envlist = py{27,35,36,37,38,38}-pytestlatest,py38-pytest53
+envlist = py{27,35,36,37,38}-pytestlatest,py38-pytest53
 
 [testenv]
 deps=
@@ -10,7 +10,7 @@ deps=
     pytest-mock
     coverage
 commands=
-    coverage run --source=pytest_cpp -m pytest tests
+    pytest tests
     pytest -n8 tests
 
 [testenv:linting]