movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-11 12:15:34 +03:00
Code Issues Projects Releases Packages Wiki Activity

nixosTests.yggdrasil: migrate to runTest

Browse source 
Part Of #386873
This commit is contained in:
Martin Weinelt 2025-03-14 22:59:07 +01:00
parent 8667777300
commit 04a03a5c8c
No known key found for this signature in database
GPG key ID: 87C1E9888F856759
2 changed files with 141 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/tests/all-tests.nix
View file

@ -1300,7 +1300,7 @@ in {
xxh = handleTest ./xxh.nix {}; xxh = handleTest ./xxh.nix {};
yabar = handleTest ./yabar.nix {}; yabar = handleTest ./yabar.nix {};
ydotool = handleTest ./ydotool.nix {}; ydotool = handleTest ./ydotool.nix {};
yggdrasil = handleTest ./yggdrasil.nix {}; yggdrasil = runTest ./yggdrasil.nix;
your_spotify = runTest ./your_spotify.nix; your_spotify = runTest ./your_spotify.nix;
zammad = runTest ./zammad.nix; zammad = runTest ./zammad.nix;
zenohd = runTest ./zenohd.nix; zenohd = runTest ./zenohd.nix;

8
nixos/tests/yggdrasil.nix
View file

@ -25,7 +25,6 @@ let
danIp6 = bobPrefix + "::2"; danIp6 = bobPrefix + "::2";
in in
import ./make-test-python.nix (
{ pkgs, ... }: { pkgs, ... }:
{ {
name = "yggdrasil"; name = "yggdrasil";
@ -33,7 +32,7 @@ import ./make-test-python.nix (
maintainers = [ gazally ]; maintainers = [ gazally ];
}; };
nodes = rec { nodes = {
# Alice is listening for peerings on a specified port, # Alice is listening for peerings on a specified port,
# but has multicast peering disabled. Alice has part of her # but has multicast peering disabled. Alice has part of her
# yggdrasil config in Nix and part of it in a file. # yggdrasil config in Nix and part of it in a file.
@ -106,9 +105,7 @@ import ./make-test-python.nix (
autoStart = true; autoStart = true;
privateNetwork = true; privateNetwork = true;
hostBridge = "br0"; hostBridge = "br0";
config = config = {
{ config, pkgs, ... }:
{
networking.interfaces.eth0.ipv6 = { networking.interfaces.eth0.ipv6 = {
addresses = [ addresses = [
{ {
@ -194,4 +191,3 @@ import ./make-test-python.nix (
carol.succeed("curl --fail -g http://[${danIp6}]") carol.succeed("curl --fail -g http://[${danIp6}]")
''; '';
} }
)