_check_install_source: more fixes for upstream changes

anaconda is really kicking log messages around lately.

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

tests/_check_install_source.pm

@@ -57,9 +57,9 @@ sub run {
     elsif ($repourl) {
         # there are only three hard problems in software development:
         # naming things, cache expiry, off-by-one errors...and quoting
-        assert_script_run 'grep "Added the \'anaconda\'" /tmp/anaconda.log';
-        assert_script_run 'grep "Load metadata for the \'anaconda\'" /tmp/anaconda.log';
-        assert_script_run 'grep "Loaded metadata from.*' . ${repourl} . '" /tmp/anaconda.log';
+        assert_script_run 'grep "Added the \'anaconda\'" /tmp/anaconda.log /tmp/syslog';
+        assert_script_run 'grep "Load metadata for the \'anaconda\'" /tmp/anaconda.log /tmp/syslog';
+        assert_script_run 'grep "Loaded metadata from.*' . ${repourl} . '" /tmp/anaconda.log /tmp/syslog';
     }
     if ($repourl) {
         # check we don't have an error indicating our repo wasn't used.
@@ -70,6 +70,11 @@ sub run {
         # not a DVD), and this was causing false failures when running
         # universal tests on netinsts
         assert_script_run '! grep "base repo.*not valid" /tmp/packaging.log | grep -v "cdrom/file"';
+        # above form is before 3b5f8f4a61 , below form is after it; we
+        # don't seem to get the error for the cdrom repo on netinsts as
+        # of Fedora-Rawhide-20230414.n.0 at least. I'm not 100% sure
+        # where this message would wind up, so check everywhere
+        assert_script_run '! grep "base repository is invalid" /tmp/packaging.log /tmp/anaconda.log /tmp/syslog';
     }
     # just for convenience - sometimes it's useful to see this log
     # for a success case

tests/applications/gnome-panel/timedate.pm

@@ -27,7 +27,11 @@ sub run {
     # Check that when we click on World Clocks area
     # the clock application will be shown.
     assert_and_click("panel_add_world_clocks");
+    assert_screen(["apps_run_clocks", "grant_access"]);
+    click_lastmatch;
+    if (match_has_tag("grant_access")) {
         assert_and_click("apps_run_clocks");
+    }
     send_key("alt-f4");
     wait_still_screen(2);
     #