summaryrefslogtreecommitdiffstats
path: root/nixos/tests
diff options
context:
space:
mode:
authorKevin Cox <kevincox@kevincox.ca>2021-01-20 16:37:16 -0500
committerGitHub <noreply@github.com>2021-01-20 16:37:16 -0500
commitf1d3b04c0422a4317150ba98ba1931bf94ae0c82 (patch)
treedfc46ff012edd755a3b44acaefdbf5e8979c2c01 /nixos/tests
parent245bde3f8d6e6b691a4ada1e5c6ea3a1b2aebaa3 (diff)
parent313ee6bd963a2136479c30199e97f1e942eee003 (diff)
Merge pull request #109966 from thiagokokada/bump-opentabletdriver
opentabletdriver: 0.4.2 -> 0.5.0
Diffstat (limited to 'nixos/tests')
-rw-r--r--nixos/tests/opentabletdriver.nix13
1 files changed, 8 insertions, 5 deletions
diff --git a/nixos/tests/opentabletdriver.nix b/nixos/tests/opentabletdriver.nix
index 832d4c25a540..fe345a7bec73 100644
--- a/nixos/tests/opentabletdriver.nix
+++ b/nixos/tests/opentabletdriver.nix
@@ -1,4 +1,6 @@
-import ./make-test-python.nix ( { pkgs, ... }: {
+import ./make-test-python.nix ( { pkgs, ... }: let
+ testUser = "alice";
+in {
name = "opentabletdriver";
meta = {
maintainers = with pkgs.lib.maintainers; [ thiagokokada ];
@@ -10,7 +12,7 @@ import ./make-test-python.nix ( { pkgs, ... }: {
./common/user-account.nix
./common/x11.nix
];
- test-support.displayManager.auto.user = "alice";
+ test-support.displayManager.auto.user = testUser;
hardware.opentabletdriver.enable = true;
};
@@ -18,10 +20,11 @@ import ./make-test-python.nix ( { pkgs, ... }: {
''
machine.start()
machine.wait_for_x()
- machine.wait_for_unit("opentabletdriver.service", "alice")
+ machine.wait_for_unit("opentabletdriver.service", "${testUser}")
- machine.succeed("cat /etc/udev/rules.d/30-opentabletdriver.rules")
+ machine.succeed("cat /etc/udev/rules.d/99-opentabletdriver.rules")
# Will fail if service is not running
- machine.succeed("otd detect")
+ # Needs to run as the same user that started the service
+ machine.succeed("su - ${testUser} -c 'otd detect'")
'';
})