From 03d0cd2f4a96f4bdf89ca7d44fd4aa8e40f8fd5e Mon Sep 17 00:00:00 2001 From: Frank Bergkemper Date: Fri, 16 Oct 2020 16:20:59 +0200 Subject: [PATCH 1/2] webui: add alternative chromedriver locations (cherry picked from commit e449b283f48b2d9ffd730a9689977e2d340421b1) --- webui/tests/selenium/webui-selenium-test.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/webui/tests/selenium/webui-selenium-test.py b/webui/tests/selenium/webui-selenium-test.py index 3de7a03a436..67464fa97e4 100755 --- a/webui/tests/selenium/webui-selenium-test.py +++ b/webui/tests/selenium/webui-selenium-test.py @@ -545,8 +545,10 @@ def enter_input(self, inputname, inputvalue): def getChromedriverpath(self): if SeleniumTest.chromedriverpath is None: for chromedriverpath in [ - "/usr/local/sbin/chromedriver", + "/usr/bin/chromedriver", + "/usr/sbin/chromedriver", "/usr/local/bin/chromedriver", + "/usr/local/sbin/chromedriver" ]: if os.path.isfile(chromedriverpath): return chromedriverpath From e1e812ff33db39e4547b6564c85b09b1f099f68e Mon Sep 17 00:00:00 2001 From: Frank Bergkemper Date: Thu, 29 Oct 2020 16:21:02 +0100 Subject: [PATCH 2/2] add bareos-webui to pkglists Leap 15.1 --- docs/pkglists/openSUSE_Leap_15.1.x86_64 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/pkglists/openSUSE_Leap_15.1.x86_64 b/docs/pkglists/openSUSE_Leap_15.1.x86_64 index 3e46ad6a49d..5d11d48727c 100644 --- a/docs/pkglists/openSUSE_Leap_15.1.x86_64 +++ b/docs/pkglists/openSUSE_Leap_15.1.x86_64 @@ -20,9 +20,11 @@ debug/x86_64/bareos-storage-python-plugin-debuginfo debug/x86_64/bareos-storage-tape-debuginfo debug/x86_64/bareos-tools-debuginfo debug/x86_64/bareos-traymonitor-debuginfo +noarch/bareos-webui noarch/python2-bareos noarch/python3-bareos src/bareos +src/bareos-webui src/python-bareos x86_64/bareos x86_64/bareos-bconsole