JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nixos/tests/spacecookie: refactor

Browse Source 
* Use proper gopher urls
* The client vms name is also controlled in a single place now
* fileContent holds the precise file content now
* wait for the spacecookie unit instead of the port
  * avoids sending an empty request
  * since spacecookie is a notify service it only is fully started when
    the socket has been set up.
This commit is contained in:
sternenseemann 2020-12-28 00:16:26 +01:00 committed by sterni
parent 6b577f46b4
commit 8abd77c811
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
nixos/tests/spacecookie.nix
View File

@ -1,7 +1,8 @@
let let
gopherRoot = "/tmp/gopher"; gopherRoot = "/tmp/gopher";
gopherHost = "gopherd"; gopherHost = "gopherd";
fileContent = "Hello Gopher!"; gopherClient = "client";
fileContent = "Hello Gopher!\n";
fileName = "file.txt"; fileName = "file.txt";
in in
import ./make-test-python.nix ({...}: { import ./make-test-python.nix ({...}: {
@ -12,7 +13,7 @@ in
systemd.services.spacecookie = { systemd.services.spacecookie = {
preStart = '' preStart = ''
mkdir -p ${gopherRoot}/directory mkdir -p ${gopherRoot}/directory
echo "${fileContent}" > ${gopherRoot}/${fileName} printf "%s" "${fileContent}" > ${gopherRoot}/${fileName}
''; '';
}; };
@ -23,25 +24,27 @@ in
}; };
}; };
client = {}; ${gopherClient} = {};
}; };
testScript = '' testScript = ''
start_all() start_all()
${gopherHost}.wait_for_open_port(70)
${gopherHost}.wait_for_unit("spacecookie.service")
client.wait_for_unit("network.target")
fileResponse = client.succeed("curl -f -s gopher://${gopherHost}//${fileName}") # with daemon type notify, the unit being started
# should also mean the port is open
${gopherHost}.wait_for_unit("spacecookie.service")
${gopherClient}.wait_for_unit("network.target")
fileResponse = ${gopherClient}.succeed("curl -f -s gopher://${gopherHost}/0/${fileName}")
# the file response should return our created file exactly # the file response should return our created file exactly
if not (fileResponse == "${fileContent}\n"): if not (fileResponse == "${builtins.replaceStrings [ "\n" ] [ "\\n" ] fileContent}"):
raise Exception("Unexpected file response") raise Exception("Unexpected file response")
# sanity check on the directory listing: we serve a directory and a file # sanity check on the directory listing: we serve a directory and a file
# via gopher, so the directory listing should have exactly two entries, # via gopher, so the directory listing should have exactly two entries,
# one with gopher file type 0 (file) and one with file type 1 (directory). # one with gopher file type 0 (file) and one with file type 1 (directory).
dirResponse = client.succeed("curl -f -s gopher://${gopherHost}") dirResponse = ${gopherClient}.succeed("curl -f -s gopher://${gopherHost}")
dirEntries = [l[0] for l in dirResponse.split("\n") if len(l) > 0] dirEntries = [l[0] for l in dirResponse.split("\n") if len(l) > 0]
dirEntries.sort() dirEntries.sort()