From 670f5287813c938c00429a97687c2d2f1422ef79 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Wed, 30 Dec 2020 17:12:43 +0100 Subject: [PATCH] Adjust test for changed display language modal MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/cockpit-project/cockpit/commit/f1542d54dba rewrote the language selector dialog. Update the tests to also work with cockpit ≥ 233. Do the version comparison dynamically for the time being, as this breaks several image refreshes. We can drop this again and only use the new code once all of these landed. --- test/check-application | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/test/check-application b/test/check-application index 826e0ad..58e8841 100755 --- a/test/check-application +++ b/test/check-application @@ -36,8 +36,14 @@ class TestApplication(testlib.MachineCase): b.click("#navbar-dropdown") b.click(".display-language-menu a") b.wait_popup('display-language') - b.set_val("#display-language select", "de-de") - b.click("#display-language-select-button") + # the dialog changed in cockpit 233 + cockpit_version = float(m.execute("cockpit-bridge --version | sed -n '/Version:/ s/^.*: //p'").strip()) + if cockpit_version >= 233: + b.set_val("#display-language-modal select", "de-de") + b.click("#display-language-modal button.pf-m-primary") + else: + b.set_val("#display-language select", "de-de") + b.click("#display-language-select-button") b.expect_load() # HACK: work around language switching in Chrome not working in current session (Cockpit issue #8160) b.reload(ignore_cache=True) @@ -50,5 +56,6 @@ class TestApplication(testlib.MachineCase): # page label (from js) should be translated b.wait_in_text(".pf-c-alert__title", "Läuft auf") + if __name__ == '__main__': testlib.test_main()