From 87636878dad5ccce204d3a207f63b3309bd8df0e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 5 Mar 2024 16:28:07 +0100 Subject: [PATCH] Revert "workflow: run assembler tests in parallel" This reverts commit ea36e25b09a3eb0bd2424361d9fd2f48ab3c3dfd. --- .github/workflows/test.yml | 3 --- test/run/test_assemblers.py | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fce74e8f..f34942ef 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -66,9 +66,6 @@ jobs: with: image: ghcr.io/osbuild/osbuild-ci:latest-202308241910 run: | - # Using 4 workers is a bit arbitrary, "auto" is probably too - # aggressive. - export TEST_WORKERS="-n 4" export OSBUILD_TEST_STORE=/var/tmp/osbuild-test-store TEST_CATEGORY="test.run.test_assemblers" \ tox -e "py36" diff --git a/test/run/test_assemblers.py b/test/run/test_assemblers.py index 2dcffb3e..4cbbf13c 100644 --- a/test/run/test_assemblers.py +++ b/test/run/test_assemblers.py @@ -252,8 +252,7 @@ def loop_create_device(ctl, fd, offset=None, sizelimit=None): lo = ctl.loop_for_fd(fd, offset=offset, sizelimit=sizelimit, - autoclear=True, - lock=True) + autoclear=True) yield lo finally: if lo: