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..c7c99cec63f7 100644 --- a/packit.yaml +++ b/packit.yaml @@ -23,50 +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 - branch: "^main$" - owner: "@cockpit" - project: "main-builds" - preserve_project: True - - job: copr_build trigger: release owner: "@cockpit" diff --git a/pkg/networkmanager/firewall-client.js b/pkg/networkmanager/firewall-client.js index c43b7309d611..84025f42a6d0 100644 --- a/pkg/networkmanager/firewall-client.js +++ b/pkg/networkmanager/firewall-client.js @@ -51,8 +51,7 @@ const firewalld_service = service.proxy('firewalld'); let firewalld_dbus = null; function debug() { - if (window.debugging == "all" || window.debugging?.includes("firewalld")) // not-covered: debugging - console.debug("firewalld:", ...arguments); // not-covered: debugging + console.debug("firewalld:", ...arguments); // not-covered: debugging } firewall.debouncedGetZones = debounce(300, () => { diff --git a/test/verify/check-networkmanager-firewall b/test/verify/check-networkmanager-firewall index 9f9aac8f0935..07c73b220beb 100755 --- a/test/verify/check-networkmanager-firewall +++ b/test/verify/check-networkmanager-firewall @@ -92,6 +92,9 @@ class TestFirewall(netlib.NetworkCase): wait_unit_state(m, "firewalld", "inactive") b.wait_in_text("#networking-firewall-summary", "0 active zones") + b.cdp.trace = True + m.verbose = True + # toggle the service from CLI, page should react try: m.execute("systemctl start firewalld") @@ -109,27 +112,30 @@ class TestFirewall(netlib.NetworkCase): m.execute("firewall-cmd --get-active-zones >&2") raise - try: - m.execute("systemctl stop firewalld") - wait_unit_state(m, "firewalld", "inactive") - except testlib.Error: - print("====== firewalld.service =======") - print(m.execute("systemctl status firewalld")) - raise + self.allow_journal_messages( + ".*The name org.fedoraproject.FirewallD1 was not provided by any .service files.*", + ".*org.fedoraproject.FirewallD1: .*: GDBus.Error:org.freedesktop.DBus.Error.NoReply.*") - self.wait_onoff("#networking-firewall-summary", val=False) - b.wait_in_text("#networking-firewall-summary", "0 active zones") + def testNetworkingPage2(self): + self.testNetworkingPage() - b.click("#networking-firewall-link") - b.enter_page("/network/firewall") + def testNetworkingPage3(self): + self.testNetworkingPage() - b.click(".pf-v5-c-breadcrumb li:first-of-type") + def testNetworkingPage4(self): + self.testNetworkingPage() - b.enter_page("/network") + def testNetworkingPage5(self): + self.testNetworkingPage() - self.allow_journal_messages( - ".*The name org.fedoraproject.FirewallD1 was not provided by any .service files.*", - ".*org.fedoraproject.FirewallD1: .*: GDBus.Error:org.freedesktop.DBus.Error.NoReply.*") + def testNetworkingPage6(self): + self.testNetworkingPage() + + def testNetworkingPage7(self): + self.testNetworkingPage() + + def testNetworkingPage8(self): + self.testNetworkingPage() # test missing "pkcheck" binary, in that case fallback to the admin check def testPkcheckMissing(self):