External-Mirrors/nextcloudpi
2
0
Fork 0
mirror of https://github.com/nextcloud/nextcloudpi.git synced 2026-01-10 15:12:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

SettingsService.php: Fix syntax errors

Browse Source 
Signed-off-by: Tobias Knöppler <6317548+theCalcaholic@users.noreply.github.com>
This commit is contained in:
Tobias Knöppler 2024-09-05 19:22:41 +02:00
parent 94dd609fab
commit 325834f86a
No known key found for this signature in database
GPG Key ID: 44FD368932E645C1
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ncp-app/lib/Service/SettingsService.php
View File

@ -38,7 +38,7 @@ class SettingsService {
}
if ($config == null) {
$this->logger->error("Failed to retrieve ncp config (exit code: $ret)");
$this->logger->error("ERR: $stderr")
$this->logger->error("ERR: $stderr");
return $defaults;
}
return $config;
@ -139,7 +139,7 @@ class SettingsService {
$stderr = stream_get_contents($pipes[2]);
fclose($pipes[2]);
$this->logger->error("STDERR: $stderr")
$this->logger->error("STDERR: $stderr");
return [proc_close($proc), $stdout, $stderr];
}
}

19
tests/nextcloud_tests.py
View File

@ -122,8 +122,8 @@ def is_admin_notifications_checkbox(item: WebElement):
return False
def close_first_run_wizard(driver: WebDriver):
wait = WebDriverWait(driver, 20)
def close_first_run_wizard(driver: WebDriver, wait_multiplier=1):
wait = WebDriverWait(driver, 20 * wait_multiplier)
first_run_wizard = None
try:
first_run_wizard = driver.find_element(By.CSS_SELECTOR, "#firstrunwizard")
@ -152,7 +152,7 @@ def close_first_run_wizard(driver: WebDriver):
time.sleep(3)
def test_nextcloud(IP: str, nc_port: str, driver: WebDriver, skip_release_check: bool):
def test_nextcloud(IP: str, nc_port: str, driver: WebDriver, skip_release_check: bool, wait_multiplier=1):
""" Login and assert admin page checks"""
test = Test()
test.new("nextcloud page")
@ -179,7 +179,7 @@ def test_nextcloud(IP: str, nc_port: str, driver: WebDriver, skip_release_check:
test.report("password", "Wrong password" not in driver.page_source, msg="Failed to login with provided password")
test.new("settings config")
wait = WebDriverWait(driver, 60)
wait = WebDriverWait(driver, 60 * wait_multiplier)
try:
wait.until(VisibilityOfElementLocatedByAnyLocator([(By.CSS_SELECTOR, "#security-warning-state-ok"),
(By.CSS_SELECTOR, "#security-warning-state-warning"),
@ -236,7 +236,7 @@ def test_nextcloud(IP: str, nc_port: str, driver: WebDriver, skip_release_check:
except Exception as e:
test.check(e)
close_first_run_wizard(driver)
close_first_run_wizard(driver, wait_multiplier)
test.new("admin section (1)")
try:
@ -289,7 +289,7 @@ def test_nextcloud(IP: str, nc_port: str, driver: WebDriver, skip_release_check:
except Exception as e:
test.check(e)
test.new("admin section (2)")
wait = WebDriverWait(driver, 10)
wait = WebDriverWait(driver, 10 * wait_multiplier)
try:
li = next(filter(is_admin_notifications_checkbox, list_items))
li.find_element(By.TAG_NAME, "input").click()
@ -321,13 +321,14 @@ if __name__ == "__main__":
# parse options
try:
opts, args = getopt.getopt(sys.argv[1:], 'hn', ['help', 'new', 'no-gui', 'skip-release-check'])
opts, args = getopt.getopt(sys.argv[1:], 'hn', ['help', 'new', 'no-gui', 'skip-release-check', 'wait-multiplier='])
except getopt.GetoptError:
usage()
sys.exit(2)
skip_release_check = False
options = webdriver.FirefoxOptions()
wait_multiplier = 1
for opt, arg in opts:
if opt in ('-h', '--help'):
usage()
@ -339,6 +340,8 @@ if __name__ == "__main__":
options.add_argument("-headless")
elif opt == '--skip-release-check':
skip_release_check = True
elif opt == '--wait-multiplier':
wait_multiplier = int(arg)
else:
usage()
sys.exit(2)
@ -377,7 +380,7 @@ if __name__ == "__main__":
driver = webdriver.Firefox(options=options)
failed=False
try:
test_nextcloud(IP, nc_port, driver, skip_release_check)
test_nextcloud(IP, nc_port, driver, skip_release_check, wait_multiplier)
except Exception as e:
print(e)
print(traceback.format_exc())