mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-27 08:04:14 +00:00
4f0dadbf38
After final improvements to the official formatter implementation,
this commit now performs the first treewide reformat of Nix files using it.
This is part of the implementation of RFC 166.
Only "inactive" files are reformatted, meaning only files that
aren't being touched by any PR with activity in the past 2 months.
This is to avoid conflicts for PRs that might soon be merged.
Later we can do a full treewide reformat to get the rest,
which should not cause as many conflicts.
A CI check has already been running for some time to ensure that new and
already-formatted files are formatted, so the files being reformatted here
should also stay formatted.
This commit was automatically created and can be verified using
nix-build a08b3a4d19.tar.gz \
--argstr baseRev b32a094368
result/bin/apply-formatting $NIXPKGS_PATH
109 lines
3.2 KiB
Nix
109 lines
3.2 KiB
Nix
let
|
|
clients = [
|
|
"ircclient1"
|
|
"ircclient2"
|
|
];
|
|
server = "ergochat";
|
|
ircPort = 6667;
|
|
channel = "nixos-cat";
|
|
iiDir = "/tmp/irc";
|
|
in
|
|
|
|
import ./make-test-python.nix (
|
|
{ pkgs, lib, ... }:
|
|
{
|
|
name = "ergochat";
|
|
nodes =
|
|
{
|
|
"${server}" = {
|
|
networking.firewall.allowedTCPPorts = [ ircPort ];
|
|
services.ergochat = {
|
|
enable = true;
|
|
settings.server.motd = pkgs.writeText "ergo.motd" ''
|
|
The default MOTD doesn't contain the word "nixos" in it.
|
|
This one does.
|
|
'';
|
|
};
|
|
};
|
|
}
|
|
// lib.listToAttrs (
|
|
builtins.map (
|
|
client:
|
|
lib.nameValuePair client {
|
|
imports = [
|
|
./common/user-account.nix
|
|
];
|
|
|
|
systemd.services.ii = {
|
|
requires = [ "network.target" ];
|
|
wantedBy = [ "default.target" ];
|
|
|
|
serviceConfig = {
|
|
Type = "simple";
|
|
ExecPreStartPre = "mkdir -p ${iiDir}";
|
|
ExecStart = ''
|
|
${lib.getBin pkgs.ii}/bin/ii -n ${client} -s ${server} -i ${iiDir}
|
|
'';
|
|
User = "alice";
|
|
};
|
|
};
|
|
}
|
|
) clients
|
|
);
|
|
|
|
testScript =
|
|
let
|
|
msg = client: "Hello, my name is ${client}";
|
|
clientScript =
|
|
client:
|
|
[
|
|
''
|
|
${client}.wait_for_unit("network.target")
|
|
${client}.systemctl("start ii")
|
|
${client}.wait_for_unit("ii")
|
|
${client}.wait_for_file("${iiDir}/${server}/out")
|
|
''
|
|
# look for the custom text in the MOTD.
|
|
''
|
|
${client}.wait_until_succeeds("grep 'nixos' ${iiDir}/${server}/out")
|
|
''
|
|
# wait until first PING from server arrives before joining,
|
|
# so we don't try it too early
|
|
''
|
|
${client}.wait_until_succeeds("grep 'PING' ${iiDir}/${server}/out")
|
|
''
|
|
# join ${channel}
|
|
''
|
|
${client}.succeed("echo '/j #${channel}' > ${iiDir}/${server}/in")
|
|
${client}.wait_for_file("${iiDir}/${server}/#${channel}/in")
|
|
''
|
|
# send a greeting
|
|
''
|
|
${client}.succeed(
|
|
"echo '${msg client}' > ${iiDir}/${server}/#${channel}/in"
|
|
)
|
|
''
|
|
# check that all greetings arrived on all clients
|
|
]
|
|
++ builtins.map (other: ''
|
|
${client}.succeed(
|
|
"grep '${msg other}$' ${iiDir}/${server}/#${channel}/out"
|
|
)
|
|
'') clients;
|
|
|
|
# foldl', but requires a non-empty list instead of a start value
|
|
reduce = f: list: builtins.foldl' f (builtins.head list) (builtins.tail list);
|
|
in
|
|
''
|
|
start_all()
|
|
${server}.systemctl("status ergochat")
|
|
${server}.wait_for_open_port(${toString ircPort})
|
|
|
|
# run clientScript for all clients so that every list
|
|
# entry is executed by every client before advancing
|
|
# to the next one.
|
|
''
|
|
+ lib.concatStrings (reduce (lib.zipListsWith (cs: c: cs + c)) (builtins.map clientScript clients));
|
|
}
|
|
)
|