From: Scott Worley <scottworley@scottworley.com>
Date: Mon, 27 Jul 2020 23:15:46 +0000 (-0700)
Subject: Name hostDeviceIDFilename
X-Git-Url: http://git.scottworley.com/syncthing-autoregister/commitdiff_plain/ff8eb13963762138a5193811192cedad0a5c6172?ds=sidebyside

Name hostDeviceIDFilename
---

diff --git a/tests/automatic-enrollment.nix b/tests/automatic-enrollment.nix
index 4ff3670..5ab4efa 100644
--- a/tests/automatic-enrollment.nix
+++ b/tests/automatic-enrollment.nix
@@ -67,17 +67,18 @@ import <nixpkgs/nixos/tests/make-test-python.nix> ({ pkgs, lib, ... }:
           "${configurationWithDeviceIDs}"
       )
 
+      hostDeviceIDFilename = os.path.join(
+          os.environ["out"],
+          os.path.basename("${deviceIDFilename}"),
+      )
+
       a.wait_for_unit("syncthing-autoregister.service")
       setConfig(a, configurationWithDeviceIDs)
       verifyDeviceIDSet(a, "a")
       a.copy_from_vm("${deviceIDFilename}")
 
       b.copy_from_host(
-          os.path.join(
-              os.environ["out"],
-              os.path.basename("${deviceIDFilename}"),
-          ),
-          "${deviceIDFilename}",
+          hostDeviceIDFilename, "${deviceIDFilename}"
       )
       b.succeed("chown syncthing ${deviceIDFilename}")
       setConfig(b, configurationWithDeviceIDs)