diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index c09014bf..59215f85 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -37,7 +37,7 @@ jobs: run: | pip3 config set global.break-system-packages 1 pip3 install -e . - python3 setup.py test + python3 -m unittest unit: name: "unit" @@ -109,7 +109,7 @@ jobs: run: | pip3 config set global.break-system-packages 1 pip3 install -e . - python3 setup.py test + python3 -m unittest - name: 'Generate coverage reports (openSUSE Tumbleweed)' if: ${{ contains(matrix.container, '/opensuse/tumbleweed') }} diff --git a/behave/features/repairwc.feature b/behave/features/repairwc.feature index 1021ccda..8c3a4f45 100644 --- a/behave/features/repairwc.feature +++ b/behave/features/repairwc.feature @@ -17,11 +17,7 @@ Scenario: Run `osc repairwc` on a project without .osc/_osclib_version And I set working directory to "{context.osc.temp}/test:factory" And I remove file "{context.osc.temp}/test:factory/.osc/_osclib_version" When I execute osc with args "status" - Then the exit code is 0 - And file "{context.osc.temp}/test:factory/.osc/_osclib_version" does not exist - When I execute osc with args "repairwc" - Then the exit code is 0 - When I execute osc with args "status" + # assume store version 1.0 for a project Then the exit code is 0 And file "{context.osc.temp}/test:factory/.osc/_osclib_version" exists @@ -45,7 +41,5 @@ Scenario: Run `osc repairwc` on a package without .osc/_osclib_version Then the exit code is 1 And file "{context.osc.temp}/test:factory/test-pkgA/.osc/_osclib_version" does not exist When I execute osc with args "repairwc" - Then the exit code is 0 - When I execute osc with args "status" - Then the exit code is 0 - And file "{context.osc.temp}/test:factory/test-pkgA/.osc/_osclib_version" exists + # no assumption about the store version for a package + Then the exit code is 1 diff --git a/contrib/osc.spec b/contrib/osc.spec index f65c6e98..c18e3026 100644 --- a/contrib/osc.spec +++ b/contrib/osc.spec @@ -192,7 +192,7 @@ install -Dm0644 oscrc.5 %{buildroot}%{_mandir}/man5/oscrc.5 %python3_fix_shebang %check -%{use_python} setup.py test +%{use_python} -m unittest %files %defattr(-,root,root,-)