aboutsummaryrefslogtreecommitdiffstats
path: root/tests/by-name
diff options
context:
space:
mode:
authorBenedikt Peetz <benedikt.peetz@b-peetz.de>2025-04-28 13:37:55 +0200
committerBenedikt Peetz <benedikt.peetz@b-peetz.de>2025-04-28 13:37:55 +0200
commit9557336692627ab9c942c30e19cd2a0ee5a7f410 (patch)
treeff5c7b0d8bc0aa4c590e7e6ee445e4a651c1319f /tests/by-name
parentmodules/sharkey: Add required `@chown` syscall group to allow list (diff)
downloadnixos-server-9557336692627ab9c942c30e19cd2a0ee5a7f410.zip
pkgs/sharkey: 2025.2.2 -> 2025.2.3
There is no change log, as this is a security update.
Diffstat (limited to 'tests/by-name')
-rw-r--r--tests/by-name/sh/sharkey-cpu/test.nix7
-rw-r--r--tests/by-name/sh/sharkey/test.nix1
2 files changed, 3 insertions, 5 deletions
diff --git a/tests/by-name/sh/sharkey-cpu/test.nix b/tests/by-name/sh/sharkey-cpu/test.nix
index d4f9332..438cfb3 100644
--- a/tests/by-name/sh/sharkey-cpu/test.nix
+++ b/tests/by-name/sh/sharkey-cpu/test.nix
@@ -11,7 +11,7 @@
nixos-lib.runTest {
hostPkgs = pkgs; # the Nixpkgs package set used outside the VMs
- name = "sharkey-images";
+ name = "sharkey-cpu";
node = {
specialArgs = {inherit pkgsUnstable extraModules vhackPackages nixpkgs-unstable nixLib;};
@@ -40,7 +40,7 @@ nixos-lib.runTest {
# Avoid an error from this service.
"acme-sharkey.server".serviceConfig.ExecStart = pkgs.lib.mkForce "${pkgs.lib.getExe' pkgs.coreutils "true"}";
- # Test, that sharkey's hardening still allows access to the CPUs.
+ # Test that sharkey's hardening still allows access to the CPUs.
sharkey.serviceConfig.ExecStart = let
nodejs = pkgs.lib.getExe pkgsUnstable.nodejs;
script = pkgs.writeTextFile {
@@ -66,9 +66,8 @@ nixos-lib.runTest {
from time import sleep
start_all()
- server.wait_for_unit("sharkey.service")
- # Give the service time to start.
+ # Give the service time to run.
sleep(3)
with subtest("All services running"):
diff --git a/tests/by-name/sh/sharkey/test.nix b/tests/by-name/sh/sharkey/test.nix
index 40efe17..b2ad461 100644
--- a/tests/by-name/sh/sharkey/test.nix
+++ b/tests/by-name/sh/sharkey/test.nix
@@ -97,7 +97,6 @@ nixos-lib.runTest {
# Start the actual testing machines
start_all()
-
with subtest("Add pebble ca key to all services"):
for node in [name_server, server, client]:
node.wait_for_unit("network-online.target")