diff options
author | Yureka <yuka@yuka.dev> | 2022-05-06 12:38:28 +0200 |
---|---|---|
committer | Yureka <yuka@yuka.dev> | 2022-05-06 12:38:28 +0200 |
commit | 96aaf29234d4dd39d3fcd49452039269f4730f4f (patch) | |
tree | a14d6ac1a0b4093515a1324d395b56814ee76538 /nixos/tests/pleroma.nix | |
parent | 0b47302cc3610bcb29def433745dd803c7f76342 (diff) |
Revert "Merge pull request #164398 from NinjaTrappeur/nin/pleroma-wrappers"
This reverts commit 05417a66e7bfee5b0607a12eaf81db33a47a6afd, reversing changes made to 53e4f8d2376c68dfdd614a123d5da0a8b10cf3be.
Diffstat (limited to 'nixos/tests/pleroma.nix')
-rw-r--r-- | nixos/tests/pleroma.nix | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/nixos/tests/pleroma.nix b/nixos/tests/pleroma.nix index 90a9a25110447..bf3623fce38b7 100644 --- a/nixos/tests/pleroma.nix +++ b/nixos/tests/pleroma.nix @@ -32,7 +32,8 @@ import ./make-test-python.nix ({ pkgs, ... }: # system one. Overriding this pretty bad default behaviour. export REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt - echo "jamy-password" | toot login_cli -i "pleroma.nixos.test" -e "jamy@nixos.test" + export TOOT_LOGIN_CLI_PASSWORD="jamy-password" + toot login_cli -i "pleroma.nixos.test" -e "jamy@nixos.test" echo "Login OK" # Send a toot then verify it's part of the public timeline @@ -167,6 +168,21 @@ import ./make-test-python.nix ({ pkgs, ... }: cp key.pem cert.pem $out ''; + /* Toot is preventing users from feeding login_cli a password non + interactively. While it makes sense most of the times, it's + preventing us to login in this non-interactive test. This patch + introduce a TOOT_LOGIN_CLI_PASSWORD env variable allowing us to + provide a password to toot login_cli + + If https://github.com/ihabunek/toot/pull/180 gets merged at some + point, feel free to remove this patch. */ + custom-toot = pkgs.toot.overrideAttrs(old:{ + patches = [ (pkgs.fetchpatch { + url = "https://github.com/NinjaTrappeur/toot/commit/b4a4c30f41c0cb7e336714c2c4af9bc9bfa0c9f2.patch"; + sha256 = "sha256-0xxNwjR/fStLjjUUhwzCCfrghRVts+fc+fvVJqVcaFg="; + }) ]; + }); + hosts = nodes: '' ${nodes.pleroma.config.networking.primaryIPAddress} pleroma.nixos.test ${nodes.client.config.networking.primaryIPAddress} client.nixos.test @@ -178,7 +194,7 @@ import ./make-test-python.nix ({ pkgs, ... }: security.pki.certificateFiles = [ "${tls-cert}/cert.pem" ]; networking.extraHosts = hosts nodes; environment.systemPackages = with pkgs; [ - toot + custom-toot send-toot ]; }; |