From beed278452b911751031acd975e4d29650ef4468 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Mon, 1 Mar 2021 10:03:08 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/cockpit.git#ee1b4b8891b64239ab6e195be356fbb4e7b0004c
---
 .gitignore        |  1 +
 cockpit.spec      | 10 +++++++++-
 sources           |  2 +-
 tests/run-test.sh | 10 +++++-----
 tests/verify.sh   | 20 +++++++-------------
 5 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index e85686e..3406146 100644
--- a/.gitignore
+++ b/.gitignore
@@ -199,3 +199,4 @@
 /cockpit-236.tar.xz
 /cockpit-237.tar.xz
 /cockpit-238.tar.xz
+/cockpit-238.1.tar.xz
diff --git a/cockpit.spec b/cockpit.spec
index fb677ae..3bab726 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -1,5 +1,5 @@
 # This spec file has been automatically updated
-Version:        238
+Version:        238.1
 Release: 1%{?dist}
 #
 # Copyright (C) 2014-2020 Red Hat, Inc.
@@ -686,6 +686,14 @@ via PackageKit.
 
 # The changelog is automatically generated and merged
 %changelog
+* Mon Feb 22 2021 Martin Pitt <mpitt@redhat.com> - 238.1-1
+
+- Several UI alignment fixes
+- Updates: Show PackageKit errors properly
+- Re-drop unit tests from built packages
+- Metrics: Don't show swap column when no swap is present
+- Metrics: Don't show duplicate events
+
 * Wed Feb 17 2021 Katerina Koukiou <kkoukiou@redhat.com> - 238-1
 
 - Updates: List outdated software that needs a restart
diff --git a/sources b/sources
index 090c8f3..5e3dbd7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cockpit-238.tar.xz) = b2452c962fb114c8fee1a5d0210b3999bef8ba1c80133e918a45210f6cb566a60ad0c9ee514aff970a41310fae268b04954b4762c6fd6d8b411dbce2ef012879
+SHA512 (cockpit-238.1.tar.xz) = b338a3c797feb573550ead9a1a9382ef8bf96987fa24b366581e10e98ce0c927a9b8aeb8c2bbe9b20952d3cc40236340113e87d1ac51be2f7eca051d091749cd
diff --git a/tests/run-test.sh b/tests/run-test.sh
index ae63992..7d714ef 100755
--- a/tests/run-test.sh
+++ b/tests/run-test.sh
@@ -53,10 +53,10 @@ if [ -n "$test_optional" ]; then
          TestUpdates.testSecurityOnly"
 
     # Fedora gating tests are running on infra without /dev/kvm; Machines tests are too darn slow there
-    if [ -w /dev/kvm ]; then
-        TESTS="$TESTS TestMachines"
-    else
+    if [ "$ID" = "fedora" ]; then
         TESTS="$TESTS TestMachinesCreate.testCreateImportDisk"
+    else
+        TESTS="$TESTS TestMachines"
     fi
 fi
 
@@ -100,9 +100,9 @@ done
 test/common/run-tests --test-dir test/verify --nondestructive $exclude_options \
     --machine localhost:22 --browser localhost:9090 $TESTS || RC=$?
 
-# check-menu is not @nondestructive yet, keep it last
+# check-shell-menu is not @nondestructive yet, keep it last
 if [ -n "$test_basic" ]; then
-    test/verify/check-menu --machine localhost:22 --browser localhost:9090 || RC=$?
+    test/verify/check-shell-menu --machine localhost:22 --browser localhost:9090 || RC=$?
 fi
 
 echo $RC > "$LOGS/exitcode"
diff --git a/tests/verify.sh b/tests/verify.sh
index d6fe87a..a888992 100755
--- a/tests/verify.sh
+++ b/tests/verify.sh
@@ -13,19 +13,13 @@ mkdir -p "$LOGS"
 chmod a+w "$LOGS"
 
 # install browser; on RHEL, use chromium from epel
-# HACK: chromium 88 crashes with some keyDown commands: https://bugs.chromium.org/p/chromium/issues/detail?id=1170634
-if rpm -q chromium-headless; then
-    dnf remove -y chromium-headless
-fi
-
-if grep -q 'ID=.*rhel' /etc/os-release; then
-    dnf install -y \
-    https://kojipkgs.fedoraproject.org//packages/chromium/87.0.4280.141/1.el8/x86_64/chromium-common-87.0.4280.141-1.el8.x86_64.rpm \
-    https://kojipkgs.fedoraproject.org//packages/chromium/87.0.4280.141/1.el8/x86_64/chromium-headless-87.0.4280.141-1.el8.x86_64.rpm
-else
-    dnf install -y \
-    https://kojipkgs.fedoraproject.org//packages/chromium/87.0.4280.141/1.fc33/x86_64/chromium-common-87.0.4280.141-1.fc33.x86_64.rpm \
-    https://kojipkgs.fedoraproject.org//packages/chromium/87.0.4280.141/1.fc33/x86_64/chromium-headless-87.0.4280.141-1.fc33.x86_64.rpm
+# HACK: chromium-headless ought to be enough, but version 88 has a crash: https://bugs.chromium.org/p/chromium/issues/detail?id=1170634
+if ! rpm -q chromium; then
+    if grep -q 'ID=.*rhel' /etc/os-release; then
+        dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
+        dnf config-manager --enable epel
+    fi
+    dnf install -y chromium
 fi
 
 # make libpwquality less aggressive, so that our "foobar" password works