diff --git a/nixos/tests/freshrss/caddy-sqlite.nix b/nixos/tests/freshrss/caddy-sqlite.nix index 3c2e60e5e3bb..ebee8a06446d 100644 --- a/nixos/tests/freshrss/caddy-sqlite.nix +++ b/nixos/tests/freshrss/caddy-sqlite.nix @@ -22,7 +22,7 @@ testScript = '' machine.wait_for_unit("multi-user.target") machine.wait_for_open_port(80) - response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://localhost:80/i/") + response = machine.succeed("curl --fail-with-body --silent --header 'Host: freshrss' http://localhost:80/i/") assert 'Login · FreshRSS' in response, "Login page didn't load successfully" ''; } diff --git a/nixos/tests/freshrss/extensions.nix b/nixos/tests/freshrss/extensions.nix index bf624a6041b6..cbb033df4162 100644 --- a/nixos/tests/freshrss/extensions.nix +++ b/nixos/tests/freshrss/extensions.nix @@ -20,17 +20,18 @@ ]; testScript = '' + from lxml import etree + machine.wait_for_unit("multi-user.target") machine.wait_for_open_port(80) - response = machine.succeed("curl -s http://localhost:80/i/?c=extension") + response = machine.succeed("curl --fail-with-body --silent http://localhost:80/i/?c=extension") assert 'YouTube Video Feed' in response, "Extension not present in extensions page." # enable Title-Wrap extension - from lxml import etree tree = etree.HTML(response) csrf = tree.xpath("/html/body/header/nav/form/input/@value")[0] - response = machine.succeed(f"curl --fail-with-body -s 'http://localhost:80/i/?c=extension&a=enable&e=Title-Wrap' -d '_csrf={csrf}'") + machine.succeed(f"curl --fail-with-body --silent 'http://localhost:80/i/?c=extension&a=enable&e=Title-Wrap' -d '_csrf={csrf}'") # verify that the Title-Wrap css is accessible. - machine.succeed("curl --fail-with-body -s 'http://localhost:80/ext.php?1=&f=xExtension-TitleWrap/static/title_wrap.css'") + machine.succeed("curl --fail-with-body --silent 'http://localhost:80/ext.php?1=&f=xExtension-TitleWrap/static/title_wrap.css'") ''; } diff --git a/nixos/tests/freshrss/http-auth.nix b/nixos/tests/freshrss/http-auth.nix index 1f6fd1ad8e7d..c506e168bfd2 100644 --- a/nixos/tests/freshrss/http-auth.nix +++ b/nixos/tests/freshrss/http-auth.nix @@ -15,7 +15,7 @@ testScript = '' machine.wait_for_unit("multi-user.target") machine.wait_for_open_port(80) - response = machine.succeed("curl -vvv -s -H 'Host: freshrss' -H 'Remote-User: testuser' http://localhost:80/i/") + response = machine.succeed("curl --fail-with-body --silent -H 'Remote-User: testuser' http://localhost:80/i/") assert 'Account: testuser' in response, "http_auth method didn't work." ''; } diff --git a/nixos/tests/freshrss/nginx-sqlite.nix b/nixos/tests/freshrss/nginx-sqlite.nix index c8097465d8cd..9c025523ea6d 100644 --- a/nixos/tests/freshrss/nginx-sqlite.nix +++ b/nixos/tests/freshrss/nginx-sqlite.nix @@ -20,7 +20,7 @@ testScript = '' machine.wait_for_unit("multi-user.target") machine.wait_for_open_port(80) - response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://localhost:80/i/") + response = machine.succeed("curl --fail-with-body --silent http://localhost:80/i/") assert 'Login · FreshRSS' in response, "Login page didn't load successfully" ''; } diff --git a/nixos/tests/freshrss/none-auth.nix b/nixos/tests/freshrss/none-auth.nix index 77d636f88071..b87da4522538 100644 --- a/nixos/tests/freshrss/none-auth.nix +++ b/nixos/tests/freshrss/none-auth.nix @@ -14,7 +14,7 @@ testScript = '' machine.wait_for_unit("multi-user.target") machine.wait_for_open_port(80) - response = machine.succeed("curl -vvv -s http://localhost:80/i/") + response = machine.succeed("curl --fail-with-body --silent http://localhost:80/i/") assert ' · FreshRSS' in response, "FreshRSS stream page didn't load successfully" ''; } diff --git a/nixos/tests/freshrss/pgsql.nix b/nixos/tests/freshrss/pgsql.nix index 5fceb98b0efb..ec9864499fad 100644 --- a/nixos/tests/freshrss/pgsql.nix +++ b/nixos/tests/freshrss/pgsql.nix @@ -46,7 +46,7 @@ machine.wait_for_unit("multi-user.target") machine.wait_for_open_port(5432) machine.wait_for_open_port(80) - response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://localhost:80/i/") + response = machine.succeed("curl --fail-with-body --silent http://localhost:80/i/") assert 'Login · FreshRSS' in response, "Login page didn't load successfully" ''; }