From db94060b2267cc3e7d9be9eacc54177d2703277c Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Tue, 4 Mar 2025 20:02:20 +0100
Subject: [PATCH 1/4] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Flake lock file updates:
• Updated input 'disko':
'github:nix-community/disko/15dbf8cebd8e2655a883b74547108e089f051bf0' (2025-02-18)
→ 'github:nix-community/disko/19c1140419c4f1cdf88ad4c1cfb6605597628940' (2025-02-25)
• Updated input 'flake-parts':
'github:hercules-ci/flake-parts/32ea77a06711b758da0ad9bd6a844c5740a87abd' (2025-02-01)
→ 'github:hercules-ci/flake-parts/3876f6b87db82f33775b1ef5ea343986105db764' (2025-03-01)
• Updated input 'flake-parts/nixpkgs-lib':
'https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz?narHash=sha256-vJzFZGaCpnmo7I6i416HaBLpC%2BhvcURh/BQwROcGIp8%3D' (2025-02-01)
→ 'https://github.com/NixOS/nixpkgs/archive/6d3702243441165a03f699f64416f635220f4f15.tar.gz?narHash=sha256-3wHafybyRfpUCLoE8M%2BuPVZinImg3xX%2BNm6gEfN3G8I%3D' (2025-03-01)
• Updated input 'nix-darwin':
'github:lnl7/nix-darwin/6ab392f626a19f1122d1955c401286e1b7cf6b53' (2025-02-19)
→ 'github:lnl7/nix-darwin/991bb2f6d46fc2ff7990913c173afdb0318314cb' (2025-03-04)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/36864ed72f234b9540da4cf7a0c49e351d30d3f1' (2025-02-19)
→ 'github:nixos/nixpkgs/1546c45c538633ae40b93e2d14e0bb6fd8f13347' (2025-03-02)
• Updated input 'unstable':
'github:nixos/nixpkgs/73cf49b8ad837ade2de76f87eb53fc85ed5d4680' (2025-02-18)
→ 'github:nixos/nixpkgs/ba487dbc9d04e0634c64e3b1f0d25839a0a68246' (2025-03-03)
---
flake.lock | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/flake.lock b/flake.lock
index d391384..4e3dd0b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -94,11 +94,11 @@
]
},
"locked": {
- "lastModified": 1739841949,
- "narHash": "sha256-lSOXdgW/1zi/SSu7xp71v+55D5Egz8ACv0STkj7fhbs=",
+ "lastModified": 1740485968,
+ "narHash": "sha256-WK+PZHbfDjLyveXAxpnrfagiFgZWaTJglewBWniTn2Y=",
"owner": "nix-community",
"repo": "disko",
- "rev": "15dbf8cebd8e2655a883b74547108e089f051bf0",
+ "rev": "19c1140419c4f1cdf88ad4c1cfb6605597628940",
"type": "github"
},
"original": {
@@ -185,11 +185,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
- "lastModified": 1738453229,
- "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
+ "lastModified": 1740872218,
+ "narHash": "sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
+ "rev": "3876f6b87db82f33775b1ef5ea343986105db764",
"type": "github"
},
"original": {
@@ -320,11 +320,11 @@
]
},
"locked": {
- "lastModified": 1739933872,
- "narHash": "sha256-UhuvTR4OrWR+WBaRCZm4YMkvjJhZ1KZo/jRjE41m+Ek=",
+ "lastModified": 1741112248,
+ "narHash": "sha256-Y340xoE1Vgo0eCDJi4srVjuwlr50vYSoyJrZeXHw3n0=",
"owner": "lnl7",
"repo": "nix-darwin",
- "rev": "6ab392f626a19f1122d1955c401286e1b7cf6b53",
+ "rev": "991bb2f6d46fc2ff7990913c173afdb0318314cb",
"type": "github"
},
"original": {
@@ -336,11 +336,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1739923778,
- "narHash": "sha256-BqUY8tz0AQ4to2Z4+uaKczh81zsGZSYxjgvtw+fvIfM=",
+ "lastModified": 1740932899,
+ "narHash": "sha256-F0qDu2egq18M3edJwEOAE+D+VQ+yESK6YWPRQBfOqq8=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "36864ed72f234b9540da4cf7a0c49e351d30d3f1",
+ "rev": "1546c45c538633ae40b93e2d14e0bb6fd8f13347",
"type": "github"
},
"original": {
@@ -352,14 +352,14 @@
},
"nixpkgs-lib": {
"locked": {
- "lastModified": 1738452942,
- "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=",
+ "lastModified": 1740872140,
+ "narHash": "sha256-3wHafybyRfpUCLoE8M+uPVZinImg3xX+Nm6gEfN3G8I=",
"type": "tarball",
- "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
+ "url": "https://github.com/NixOS/nixpkgs/archive/6d3702243441165a03f699f64416f635220f4f15.tar.gz"
},
"original": {
"type": "tarball",
- "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
+ "url": "https://github.com/NixOS/nixpkgs/archive/6d3702243441165a03f699f64416f635220f4f15.tar.gz"
}
},
"root": {
@@ -468,11 +468,11 @@
},
"unstable": {
"locked": {
- "lastModified": 1739866667,
- "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=",
+ "lastModified": 1741010256,
+ "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680",
+ "rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246",
"type": "github"
},
"original": {
--
2.47.2
From 5dca2382e1cca498289118cb1b5d429920514ae9 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Tue, 4 Mar 2025 20:21:54 +0100
Subject: [PATCH 2/4] tests: wait for acme_server before starting nachtigall
to avoid a race between step-ca and acme-client
---
tests/website.nix | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tests/website.nix b/tests/website.nix
index 7939f68..e896825 100644
--- a/tests/website.nix
+++ b/tests/website.nix
@@ -44,7 +44,7 @@
};
testScript = ''
- start_all()
+ acme_server.start()
acme_server.wait_for_unit("default.target")
acme_server.wait_for_unit("step-ca.service")
@@ -52,6 +52,7 @@
acme_server.wait_for_open_port(443)
acme_server.wait_until_succeeds("curl 127.0.0.1:443")
+ nachtigall.start()
nachtigall.wait_for_unit("default.target")
nachtigall.succeed("ping test.pub.solar -c 2")
nachtigall.succeed("ping ca.test.pub.solar -c 2")
--
2.47.2
From 2f48c853fea0a76309d5c1531514fa3253ef7e58 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Tue, 4 Mar 2025 21:47:57 +0100
Subject: [PATCH 3/4] tests: don't wait for acme client unit
---
tests/website.nix | 1 -
1 file changed, 1 deletion(-)
diff --git a/tests/website.nix b/tests/website.nix
index e896825..e2010d8 100644
--- a/tests/website.nix
+++ b/tests/website.nix
@@ -56,7 +56,6 @@
nachtigall.wait_for_unit("default.target")
nachtigall.succeed("ping test.pub.solar -c 2")
nachtigall.succeed("ping ca.test.pub.solar -c 2")
- nachtigall.wait_for_unit("acme-test.pub.solar.service")
nachtigall.wait_for_unit("nginx.service")
nachtigall.wait_for_open_port(443, "test.pub.solar")
nachtigall.wait_until_succeeds("curl https://test.pub.solar/")
--
2.47.2
From 3fdc6d79ac5c4c44e9f989f20207d9d83a2d3549 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Tue, 4 Mar 2025 21:51:28 +0100
Subject: [PATCH 4/4] tests: wait for nachtigall before starting client
to avoid a race between keycloak and test client
---
tests/keycloak.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/keycloak.nix b/tests/keycloak.nix
index df8a2d7..5224b99 100644
--- a/tests/keycloak.nix
+++ b/tests/keycloak.nix
@@ -76,7 +76,7 @@ in
wmClass = su "${gdbus} ${gseval} global.display.focus_window.wm_class";
in
''
- start_all()
+ nachtigall.start()
nachtigall.wait_for_unit("default.target")
nachtigall.succeed("ping 127.0.0.1 -c 2")
@@ -87,8 +87,8 @@ in
nachtigall.wait_until_succeeds("curl http://127.0.0.1:8080/")
nachtigall.wait_until_succeeds("curl https://auth.test.pub.solar/")
+ client.start()
client.wait_for_unit("default.target")
- client.sleep(30)
# client.wait_until_succeeds("${wmClass} | grep -q 'firefox'")
client.screenshot("screen")
'';
--
2.47.2