diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c6b3405..5f29c12 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,4 +1,4 @@ -name: tests +name: Windows and MacOS on: push: @@ -16,7 +16,6 @@ jobs: fail-fast: false matrix: os: - - ["ubuntu", "ubuntu-20.04"] - ["windows", "windows-latest"] - ["macos", "macos-11"] config: @@ -27,10 +26,12 @@ jobs: name: ${{ matrix.os[0] }}-${{ matrix.config[1] }} steps: - uses: actions/checkout@v3 + - name: Set up Python uses: actions/setup-python@v4 with: python-version: ${{ matrix.config[0] }} + - name: Pip cache uses: actions/cache@v3 with: @@ -39,9 +40,12 @@ jobs: restore-keys: | ${{ runner.os }}-pip-${{ matrix.config[0] }}- ${{ runner.os }}-pip- + - name: Install dependencies run: | python -m pip install --upgrade pip pip install tox + - name: Test - run: tox -e ${{ matrix.config[1] }} + run: | + tox -e ${{ matrix.config[1] }} diff --git a/src/plone/recipe/zeoserver/tests/zeoserver.txt b/src/plone/recipe/zeoserver/tests/zeoserver.txt index c78d019..e9ad7bd 100644 --- a/src/plone/recipe/zeoserver/tests/zeoserver.txt +++ b/src/plone/recipe/zeoserver/tests/zeoserver.txt @@ -272,7 +272,8 @@ We should have a zeo.conf with log file rotation enabled:: >>> zeo = os.path.join(sample_buildout, 'parts', 'zeo') >>> with open(os.path.join(zeo, 'etc', 'zeo.conf')) as f: - ... print(f.read()) + ... output = f.read() + >>> print(output.replace('\\', '/')) %define INSTANCE ... ... @@ -473,8 +474,6 @@ be different and correspond as the buildout specified:: >>> zeopack_scripts = ('first-zeopack', 'second-zeopack') >>> zeopack_paths = [os.path.join(sample_buildout, 'bin', script) for script in zeopack_scripts] - >>> if WINDOWS: - ... zeopack_paths = [zeopack + '-script.py' for zeopack in zeopacks] >>> with open(zeopack_paths[0], 'r') as f: ... first_zeopack = f.read() >>> with open(zeopack_paths[1], 'r') as f: