diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml deleted file mode 100644 index 527661c1043e..000000000000 --- a/.github/workflows/unit-tests.yml +++ /dev/null @@ -1,51 +0,0 @@ -name: unit-tests -on: [pull_request, workflow_dispatch] -jobs: - unit-tests: - runs-on: ubuntu-22.04 - permissions: {} - strategy: - matrix: - startarg: - # avoid check-memory on i386, it has literally thousands of uninteresting/wrong errors - - { make: 'check-memory', cc: 'gcc', tag: 'latest' } - # with default Python bridge - - { make: 'distcheck', cc: 'clang', tag: 'latest' } - - { make: 'distcheck', cc: 'gcc', tag: 'i386' } - # with old C bridge - - { make: 'distcheck', cc: 'gcc', distcheck_flags: '--enable-old-bridge', tag: 'latest' } - # this runs static code checks, unlike distcheck - - { make: 'check', cc: 'gcc', tag: 'latest' } - - { make: 'pytest-cov', cc: 'gcc', tag: 'latest' } - fail-fast: false - timeout-minutes: 60 - steps: - - name: Clone repository - uses: actions/checkout@v3 - with: - # need this to also fetch tags - fetch-depth: 0 - - - name: Build unit test container if it changed - run: | - changes=$(git diff --name-only origin/${{ github.event.pull_request.base.ref }}..HEAD -- containers/unit-tests/) - if [ -n "${changes}" ]; then - case '${{ matrix.startarg.tag }}' in - i386) arch=i386;; - latest) arch=amd64;; - esac - containers/unit-tests/build $arch - fi - - - name: Run unit-tests container - timeout-minutes: 30 - # HACK: -gdwarf-4 is for clang: https://bugs.kde.org/show_bug.cgi?id=452758 - run: | - containers/unit-tests/start \ - --verbose \ - --env=FORCE_COLOR=1 \ - --env=CC='${{ matrix.startarg.cc }}' \ - --env=CFLAGS='-O2 -gdwarf-4' \ - --env=EXTRA_DISTCHECK_CONFIGURE_FLAGS='${{ matrix.startarg.distcheck_flags }}' \ - --image-tag='${{ matrix.startarg.tag }}' \ - --make '${{ matrix.startarg.make }}' diff --git a/packit.yaml b/packit.yaml index 8f77cd7cab3c..34339b42019e 100644 --- a/packit.yaml +++ b/packit.yaml @@ -23,42 +23,6 @@ srpm_build_deps: # use the nicely formatted release NEWS from our upstream release, instead of git shortlog copy_upstream_release_description: true jobs: - - job: tests - identifier: self - trigger: pull_request - targets: - - fedora-38 - - fedora-39 - - fedora-latest-aarch64 - - fedora-development - - centos-stream-8-x86_64 - - centos-stream-9-x86_64 - - centos-stream-9-aarch64 - - # current Fedora runs reverse dependency testing against https://copr.fedorainfracloud.org/coprs/g/cockpit/main-builds/ - - job: tests - identifier: revdeps - trigger: pull_request - targets: - - fedora-latest-stable - tf_extra_params: - environments: - - artifacts: - - type: repository-file - id: https://copr.fedorainfracloud.org/coprs/g/cockpit/main-builds/repo/fedora-$releasever/group_cockpit-main-builds-fedora-$releasever.repo - tmt: - context: - revdeps: "yes" - - # run build/unit tests on some interesting architectures - - job: copr_build - trigger: pull_request - targets: - # 32 bit - - fedora-development-i386 - # big-endian - - fedora-development-s390x - # for cross-project testing - job: copr_build trigger: commit diff --git a/test/verify/check-storage-mounting b/test/verify/check-storage-mounting index 260fa5a8deaf..305612cfa3cb 100755 --- a/test/verify/check-storage-mounting +++ b/test/verify/check-storage-mounting @@ -536,6 +536,11 @@ class TestStorageMountingLUKS(storagelib.StorageCase): m = self.machine b = self.browser + self.write_file("/etc/systemd/system/udisks2.service.d/debug.conf", + "[Service]\nExecStart=\nExecStart=/usr/libexec/udisks2/udisksd --debug\n", + post_restore_action="systemctl daemon-reload") + m.execute("systemctl daemon-reload; systemctl try-restart udisks2") + self.login_and_go("/storage") # Add a disk and make two partitions on it, one on /run/foo @@ -609,6 +614,10 @@ class TestStorageMountingLUKS(storagelib.StorageCase): self.assert_in_configuration(disk + "2", "crypttab", "options", "noauto") self.assertIn("noauto", m.execute("findmnt --fstab -n -o OPTIONS /run/foo/bar")) + b.eval_js('window.debugging = "dbus"') + b.cdp.trace = True + m.verbose = True + # Mount them again and check that initializing the disk will # unmount /run/foo/bar first. @@ -627,6 +636,30 @@ class TestStorageMountingLUKS(storagelib.StorageCase): self.dialog_apply() self.content_row_wait_in_col(1, 0, "Free space") + def testOverMounting2(self): + self.testOverMounting() + + def testOverMounting3(self): + self.testOverMounting() + + def testOverMounting4(self): + self.testOverMounting() + + def testOverMounting5(self): + self.testOverMounting() + + def testOverMounting6(self): + self.testOverMounting() + + def testOverMounting7(self): + self.testOverMounting() + + def testOverMounting8(self): + self.testOverMounting() + + def testOverMounting9(self): + self.testOverMounting() + if __name__ == '__main__': testlib.test_main()