Run base tests on ELN

This requires a change in the package we use for base_update_cli
because pandoc-common is not in ELN.

Signed-off-by: Adam Williamson <awilliam@redhat.com>

lib/packagetest.pm

@@ -9,15 +9,15 @@ use testapi;
 our @EXPORT = qw/prepare_test_packages verify_installed_packages verify_updated_packages/;
 
 # enable the openqa test package repositories and install the main
-# test packages, remove pandoc-common and install the fake one
+# test packages, remove acpica-tools and install the fake one
 sub prepare_test_packages {
-    # remove pandoc-common if installed (we don't use assert
+    # remove acpica-tools if installed (we don't use assert
     # here in case it's not)
-    script_run 'dnf -y remove pandoc-common', 180;
+    script_run 'dnf -y remove acpica-tools', 180;
     # grab the test repo definitions
     assert_script_run 'curl -o /etc/yum.repos.d/openqa-testrepo-1.repo https://fedorapeople.org/groups/qa/openqa-repos/openqa-testrepo-1.repo';
     # install the test packages from repo1
-    assert_script_run 'dnf -y --disablerepo=* --enablerepo=openqa-testrepo-1 install pandoc-common';
+    assert_script_run 'dnf -y --disablerepo=* --enablerepo=openqa-testrepo-1 install acpica-tools';
     if (get_var("DESKTOP") eq 'kde' && get_var("TEST") eq 'desktop_update_graphical') {
         # kick pkcon so our special update will definitely get installed
         assert_script_run 'pkcon refresh force';
@@ -27,15 +27,15 @@ sub prepare_test_packages {
 # check our test packages installed correctly (this is a test that dnf
 # actually does what it claims)
 sub verify_installed_packages {
-    validate_script_output 'rpm -q pandoc-common', sub { $_ =~ m/^pandoc-common-1.1.noarch$/ };
-    assert_script_run 'rpm -V pandoc-common';
+    validate_script_output 'rpm -q acpica-tools', sub { $_ =~ m/^acpica-tools-1.1.noarch$/ };
+    assert_script_run 'rpm -V acpica-tools';
 }
 
-# check updating the test packages and the fake pandoc-common work
+# check updating the test packages and the fake acpica-tools work
 # as expected
 sub verify_updated_packages {
-    # we don't know what version of pandoc-common we'll actually
+    # we don't know what version of acpica-tools we'll actually
     # get, so just check it's *not* the fake one
-    validate_script_output 'rpm -q pandoc-common', sub { $_ !~ m/^pandoc-common-1-1.noarch$/ };
-    assert_script_run 'rpm -V pandoc-common';
+    validate_script_output 'rpm -q acpica-tools', sub { $_ !~ m/^acpica-tools-1-1.noarch$/ };
+    assert_script_run 'rpm -V acpica-tools';
 }

needles/gnome/apps/tour/tour_leftright.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 343,
+      "ypos": 545,
+      "width": 131,
+      "height": 29,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "tour_leftright"
+  ]
+}

needles/gnome/apps/tour/tour_niceday.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 468,
+      "ypos": 544,
+      "width": 203,
+      "height": 31,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "tour_niceday"
+  ]
+}

needles/gnome/apps/tour/tour_overview-20230619.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 410,
+      "ypos": 547,
+      "width": 207,
+      "height": 29,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "tour_overview"
+  ]
+}

needles/gnome/apps/tour/tour_search.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 388,
+      "ypos": 542,
+      "width": 244,
+      "height": 33,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "tour_search"
+  ]
+}

needles/gnome/apps/tour/tour_start.json

@@ -0,0 +1,24 @@
+{
+  "area": [
+    {
+      "xpos": 421,
+      "ypos": 546,
+      "width": 184,
+      "height": 30,
+      "type": "ocr",
+      "margin": 30,
+      "refstr": "Start the Tour"
+    },
+    {
+      "xpos": 284,
+      "ypos": 284,
+      "width": 78,
+      "height": 80,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "tour_start"
+  ]
+}

needles/gnome/apps/tour/tour_updown.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 342,
+      "ypos": 545,
+      "width": 122,
+      "height": 27,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "tour_updown"
+  ]
+}

needles/gnome/apps/tour/tour_workspaces.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 322,
+      "ypos": 546,
+      "width": 379,
+      "height": 28,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "tour_workspaces"
+  ]
+}

templates.fif.json

@@ -627,6 +627,7 @@
         },
         "base_reboot_unmount": {
             "profiles": {
+                "fedora-BaseOS-dvd-iso-x86_64-*-uefi": 50,
                 "fedora-Cloud_Base-qcow2-qcow2-aarch64-*-aarch64": 20,
                 "fedora-Cloud_Base-qcow2-qcow2-ppc64le-*-ppc64le": 20,
                 "fedora-Cloud_Base-qcow2-qcow2-x86_64-*-64bit": 20,
@@ -659,6 +660,7 @@
         },
         "base_system_logging": {
             "profiles": {
+                "fedora-BaseOS-dvd-iso-x86_64-*-uefi": 50,
                 "fedora-Cloud_Base-qcow2-qcow2-aarch64-*-aarch64": 20,
                 "fedora-Cloud_Base-qcow2-qcow2-ppc64le-*-ppc64le": 20,
                 "fedora-Cloud_Base-qcow2-qcow2-x86_64-*-uefi": 20,
@@ -690,6 +692,7 @@
         },
         "base_update_cli": {
             "profiles": {
+                "fedora-BaseOS-dvd-iso-x86_64-*-uefi": 50,
                 "fedora-Cloud_Base-qcow2-qcow2-aarch64-*-aarch64": 20,
                 "fedora-Cloud_Base-qcow2-qcow2-ppc64le-*-ppc64le": 20,
                 "fedora-Cloud_Base-qcow2-qcow2-x86_64-*-uefi": 20,
@@ -716,6 +719,7 @@
         },
         "base_package_install_remove": {
             "profiles": {
+                "fedora-BaseOS-dvd-iso-x86_64-*-uefi": 50,
                 "fedora-Cloud_Base-qcow2-qcow2-aarch64-*-aarch64": 40,
                 "fedora-Cloud_Base-qcow2-qcow2-ppc64le-*-ppc64le": 40,
                 "fedora-Cloud_Base-qcow2-qcow2-x86_64-*-uefi": 40,
@@ -742,6 +746,7 @@
         },
         "base_services_start": {
             "profiles": {
+                "fedora-BaseOS-dvd-iso-x86_64-*-uefi": 50,
                 "fedora-Cloud_Base-qcow2-qcow2-aarch64-*-aarch64": 40,
                 "fedora-Cloud_Base-qcow2-qcow2-ppc64le-*-ppc64le": 40,
                 "fedora-Cloud_Base-qcow2-qcow2-x86_64-*-64bit": 40,
@@ -774,6 +779,7 @@
         },
         "base_selinux": {
             "profiles": {
+                "fedora-BaseOS-dvd-iso-x86_64-*-uefi": 50,
                 "fedora-Cloud_Base-qcow2-qcow2-aarch64-*-aarch64": 40,
                 "fedora-Cloud_Base-qcow2-qcow2-ppc64le-*-ppc64le": 40,
                 "fedora-Cloud_Base-qcow2-qcow2-x86_64-*-uefi": 40,
@@ -805,6 +811,7 @@
         },
         "base_service_manipulation": {
             "profiles": {
+                "fedora-BaseOS-dvd-iso-x86_64-*-uefi": 50,
                 "fedora-Cloud_Base-qcow2-qcow2-aarch64-*-aarch64": 40,
                 "fedora-Cloud_Base-qcow2-qcow2-ppc64le-*-ppc64le": 40,
                 "fedora-Cloud_Base-qcow2-qcow2-x86_64-*-uefi": 40,
@@ -1263,6 +1270,23 @@
                 "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%"
             }
         },
+        "tour": {
+            "profiles": {
+                "fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50,
+                "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50,
+                "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 20,
+                "fedora-Workstation-live-iso-x86_64-*-64bit": 20,
+                "fedora-Workstation-upgrade-x86_64-*-64bit": 40,
+                "fedora-Workstation-upgrade-aarch64-*-aarch64": 40,
+                "fedora-Workstation-raw_xz-raw.xz-aarch64-*-aarch64": 22
+            },
+            "settings": {
+                "BOOTFROM": "c",
+                "HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2",
+                "POSTINSTALL_PATH": "tests/applications/tour",
+                "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%"
+            }
+        },
         "weather": {
             "profiles": {
                 "fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50,

tests/applications/gnome-panel/volumebar.pm

@@ -27,15 +27,18 @@ sub run {
     menu_launch_type("terminal");
     assert_screen("apps_run_terminal");
     # Set the volume to 0%
-    script_run('pactl set-sink-volume @DEFAULT_SINK@ 0%');
+    type_safely('pactl set-sink-volume @DEFAULT_SINK@ 0%');
+    send_key('ret');
     # Check that it worked
     check_volume("zero");
     # Set the volume to 50%
-    script_run('pactl set-sink-volume @DEFAULT_SINK@ 50%');
+    type_safely('pactl set-sink-volume @DEFAULT_SINK@ 50%');
+    send_key('ret');
     # Check that it worked
     check_volume("fifty");
     # Set the volume to 100%
-    script_run('pactl set-sink-volume @DEFAULT_SINK@ 100%');
+    type_safely('pactl set-sink-volume @DEFAULT_SINK@ 100%');
+    send_key('ret');
     # Check that it worked
     check_volume("hundred");
 }

tests/applications/tour/tour.pm

@@ -0,0 +1,42 @@
+use base "installedtest";
+use strict;
+use testapi;
+use utils;
+
+# This test will test the Tour application.
+
+sub run {
+    my $self = shift;
+
+    # Start the Application
+    menu_launch_type("tour");
+
+    assert_screen("tour_start");
+    send_key("right");
+
+    assert_screen("tour_overview");
+    send_key("right");
+
+    assert_screen("tour_search");
+    send_key("right");
+
+    assert_screen("tour_workspaces");
+    send_key("right");
+
+    assert_screen("tour_updown");
+    send_key("right");
+
+    assert_screen("tour_leftright");
+    send_key("right");
+
+    assert_screen("tour_niceday");
+}
+
+sub test_flags {
+    # If this test fails, there is no need to continue.
+    return {fatal => 1, milestone => 1};
+}
+
+1;
+
+# vim: set sw=4 et:

tests/base_update_cli.pm

@@ -11,16 +11,16 @@ sub run {
     prepare_test_packages;
     # check rpm agrees they installed good
     verify_installed_packages;
-    # update the fake pandoc-common (should come from the real repo)
+    # update the fake acpica-tools (should come from the real repo)
     # this can take a long time if we get unlucky with the metadata refresh
-    assert_script_run 'dnf -y --disablerepo=openqa-testrepo* --disablerepo=updates-testing update pandoc-common', 600;
+    assert_script_run 'dnf -y --disablerepo=openqa-testrepo* --disablerepo=updates-testing update acpica-tools', 600;
     # check we got the updated version
     verify_updated_packages;
-    # now remove pandoc-common, and see if we can do a straight
+    # now remove acpica-tools, and see if we can do a straight
     # install from the default repos
-    assert_script_run 'dnf -y remove pandoc-common';
-    assert_script_run 'dnf -y --disablerepo=openqa-testrepo* --disablerepo=updates-testing install pandoc-common', 120;
-    assert_script_run 'rpm -V pandoc-common';
+    assert_script_run 'dnf -y remove acpica-tools';
+    assert_script_run 'dnf -y --disablerepo=openqa-testrepo* --disablerepo=updates-testing install acpica-tools', 120;
+    assert_script_run 'rpm -V acpica-tools';
 }
 
 sub test_flags {