summary refs log tree commit diff
diff options
context:
space:
mode:
authorJulian Stecklina <julian.stecklina@cyberus-technology.de>2019-10-27 11:44:06 +0100
committerJacek Galowicz <jacek.galowicz@cyberus-technology.de>2019-11-04 23:51:09 +0100
commit2af2d59fd611ae6ee3ed8e7867243bdd6945f020 (patch)
tree590c99e97851e0d1cfdc67f8d06885d0a9cd1f40
parent9b33b5d38c3f2f93ff03e195b090ed1b25f6d51c (diff)
downloadnixpkgs-2af2d59fd611ae6ee3ed8e7867243bdd6945f020.tar
nixpkgs-2af2d59fd611ae6ee3ed8e7867243bdd6945f020.tar.gz
nixpkgs-2af2d59fd611ae6ee3ed8e7867243bdd6945f020.tar.bz2
nixpkgs-2af2d59fd611ae6ee3ed8e7867243bdd6945f020.tar.lz
nixpkgs-2af2d59fd611ae6ee3ed8e7867243bdd6945f020.tar.xz
nixpkgs-2af2d59fd611ae6ee3ed8e7867243bdd6945f020.tar.zst
nixpkgs-2af2d59fd611ae6ee3ed8e7867243bdd6945f020.zip
nixos/emacs-daemon: convert test to python
-rw-r--r--nixos/tests/emacs-daemon.nix23
1 files changed, 13 insertions, 10 deletions
diff --git a/nixos/tests/emacs-daemon.nix b/nixos/tests/emacs-daemon.nix
index 3594e35e343..b89d9b1bde6 100644
--- a/nixos/tests/emacs-daemon.nix
+++ b/nixos/tests/emacs-daemon.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
   name = "emacs-daemon";
   meta = with pkgs.stdenv.lib.maintainers; {
     maintainers = [ ];
@@ -21,25 +21,28 @@ import ./make-test.nix ({ pkgs, ...} : {
       environment.variables.TEST_SYSTEM_VARIABLE = "system variable";
     };
 
-  testScript =
-    ''
-      $machine->waitForUnit("multi-user.target");
+  testScript = ''
+      machine.wait_for_unit("multi-user.target")
 
       # checks that the EDITOR environment variable is set
-      $machine->succeed("test \$(basename \"\$EDITOR\") = emacseditor");
+      machine.succeed('test $(basename "$EDITOR") = emacseditor')
 
       # waits for the emacs service to be ready
-      $machine->waitUntilSucceeds("systemctl --user status emacs.service | grep 'Active: active'");
+      machine.wait_until_succeeds(
+          "systemctl --user status emacs.service | grep 'Active: active'"
+      )
 
       # connects to the daemon
-      $machine->succeed("emacsclient --create-frame \$EDITOR &");
+      machine.succeed("emacsclient --create-frame $EDITOR &")
 
       # checks that Emacs shows the edited filename
-      $machine->waitForText("emacseditor");
+      machine.wait_for_text("emacseditor")
 
       # makes sure environment variables are accessible from Emacs
-      $machine->succeed("emacsclient --eval '(getenv \"TEST_SYSTEM_VARIABLE\")'") =~ /system variable/ or die;
+      machine.succeed(
+          "emacsclient --eval '(getenv \"TEST_SYSTEM_VARIABLE\")' | grep -q 'system variable'"
+      )
 
-      $machine->screenshot("emacsclient");
+      machine.screenshot("emacsclient")
     '';
 })