summary refs log tree commit diff
path: root/nixos/tests
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-06-26 12:06:25 +0000
committerGitHub <noreply@github.com>2021-06-26 12:06:25 +0000
commit45003ba5f9ca91e9f9c30202bc4865e050586377 (patch)
tree2a211004faf5993b9c09efde82c0034c39b89cef /nixos/tests
parentcbdb0976298f9ea56f06ce6b0cd132d33219ce9c (diff)
parent64d2892c925212675e307ba4b31268eba7064add (diff)
downloadnixpkgs-45003ba5f9ca91e9f9c30202bc4865e050586377.tar
nixpkgs-45003ba5f9ca91e9f9c30202bc4865e050586377.tar.gz
nixpkgs-45003ba5f9ca91e9f9c30202bc4865e050586377.tar.bz2
nixpkgs-45003ba5f9ca91e9f9c30202bc4865e050586377.tar.lz
nixpkgs-45003ba5f9ca91e9f9c30202bc4865e050586377.tar.xz
nixpkgs-45003ba5f9ca91e9f9c30202bc4865e050586377.tar.zst
nixpkgs-45003ba5f9ca91e9f9c30202bc4865e050586377.zip
Merge master into staging-next
Diffstat (limited to 'nixos/tests')
-rw-r--r--nixos/tests/go-neb.nix12
1 files changed, 6 insertions, 6 deletions
diff --git a/nixos/tests/go-neb.nix b/nixos/tests/go-neb.nix
index f8801ff68d6..4bd03dcf3c6 100644
--- a/nixos/tests/go-neb.nix
+++ b/nixos/tests/go-neb.nix
@@ -10,10 +10,11 @@ import ./make-test-python.nix ({ pkgs, ... }:
       services.go-neb = {
         enable = true;
         baseUrl = "http://localhost";
+        secretFile = pkgs.writeText "secrets" "ACCESS_TOKEN=changeme";
         config = {
           clients = [ {
             UserId = "@test:localhost";
-            AccessToken = "changeme";
+            AccessToken = "$ACCESS_TOKEN";
             HomeServerUrl = "http://localhost";
             Sync = false;
             AutoJoinRooms = false;
@@ -33,11 +34,10 @@ import ./make-test-python.nix ({ pkgs, ... }:
   testScript = ''
     start_all()
     server.wait_for_unit("go-neb.service")
-    server.wait_until_succeeds(
-        "curl -fL http://localhost:4050/services/hooks/d2lraXBlZGlhX3NlcnZpY2U"
-    )
-    server.wait_until_succeeds(
-        "journalctl -eu go-neb -o cat | grep -q service_id=wikipedia_service"
+    server.wait_until_succeeds("curl -fL http://localhost:4050/services/hooks/d2lraXBlZGlhX3NlcnZpY2U")
+    server.succeed(
+        "journalctl -eu go-neb -o cat | grep -q service_id=wikipedia_service",
+        "grep -q changeme /var/run/go-neb/config.yaml",
     )
   '';