s0me1newithhand7s/system-manager
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use the lib functions to (de)activate profiles.

Browse source
This commit is contained in:
r-vdp 2023-07-05 14:58:06 +02:00
parent 7ab72d8c7f
commit 2368eec16e
No known key found for this signature in database
2 changed files with 40 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

28
nix/lib.nix
View file

@ -284,12 +284,30 @@ in
cp ${resultImg} $out cp ${resultImg} $out
''; '';
mkTestPreamble = node: action: '' mkTestPreamble =
${node}.succeed("/system-manager-profile/bin/${action} 2>&1 | tee /tmp/output.log") { node
${node}.succeed("grep -vF 'ERROR' /tmp/output.log") , profile
''; , action
}: ''
${node}.succeed("/${profile}/bin/${action} 2>&1 | tee /tmp/output.log")
${node}.succeed("! grep -F 'ERROR' /tmp/output.log")
'';
activateProfileSnippet = node: self.lib.mkTestPreamble node "activate"; activateProfileSnippet = { node, profile ? "system-manager-profile" }:
self.lib.mkTestPreamble {
inherit node profile;
action = "activate";
};
deactivateProfileSnippet = { node, profile ? "system-manager-profile" }:
self.lib.mkTestPreamble {
inherit node profile;
action = "deactivate";
};
prepopulateProfileSnippet = { node, profile ? "system-manager-profile" }:
self.lib.mkTestPreamble {
inherit node profile;
action = "prepopulate";
};
make-vm-test = make-vm-test =
name: name:

32
test/nix/modules/default.nix
View file

@ -121,8 +121,7 @@ forEachUbuntuImage
node1.succeed("grep -F 'Error while creating file in /etc: Unmanaged path already exists in filesystem, please remove it and run system-manager again: /etc/foo_test' /tmp/output.log") node1.succeed("grep -F 'Error while creating file in /etc: Unmanaged path already exists in filesystem, please remove it and run system-manager again: /etc/foo_test' /tmp/output.log")
node1.succeed("rm /etc/foo_test") node1.succeed("rm /etc/foo_test")
node1.succeed("/system-manager-profile/bin/activate 2>&1 | tee /tmp/output.log") ${system-manager.lib.activateProfileSnippet { node = "node1"; }}
node1.succeed("! grep -F 'ERROR' /tmp/output.log")
node1.wait_for_unit("system-manager.target") node1.wait_for_unit("system-manager.target")
node1.succeed("systemctl status service-9.service") node1.succeed("systemctl status service-9.service")
@ -132,8 +131,7 @@ forEachUbuntuImage
node1.succeed("grep -F 'launch_the_rockets = true' /etc/foo.conf") node1.succeed("grep -F 'launch_the_rockets = true' /etc/foo.conf")
node1.fail("grep -F 'launch_the_rockets = false' /etc/foo.conf") node1.fail("grep -F 'launch_the_rockets = false' /etc/foo.conf")
node1.succeed("${newConfig}/bin/activate 2>&1 | tee /tmp/output.log") ${system-manager.lib.activateProfileSnippet { node = "node1"; profile = newConfig; }}
node1.succeed("! grep -F 'ERROR' /tmp/output.log")
node1.succeed("systemctl status new-service.service") node1.succeed("systemctl status new-service.service")
node1.fail("systemctl status service-9.service") node1.fail("systemctl status service-9.service")
node1.fail("cat /etc/a/nested/example/foo3") node1.fail("cat /etc/a/nested/example/foo3")
@ -157,7 +155,7 @@ forEachUbuntuImage
node1.fail("cat /etc/baz/bar/foo2") node1.fail("cat /etc/baz/bar/foo2")
node1.succeed("cat /etc/foo_new") node1.succeed("cat /etc/foo_new")
node1.succeed("${newConfig}/bin/deactivate") ${system-manager.lib.deactivateProfileSnippet { node = "node1"; profile = newConfig; }}
node1.fail("systemctl status new-service.service") node1.fail("systemctl status new-service.service")
node1.fail("cat /etc/foo_new") node1.fail("cat /etc/foo_new")
''; '';
@ -198,8 +196,8 @@ forEachUbuntuImage
node1.wait_for_unit("default.target") node1.wait_for_unit("default.target")
node1.succeed("/system-manager-profile/bin/prepopulate 2>&1 | tee /tmp/output.log") ${system-manager.lib.activateProfileSnippet { node = "node1"; }}
node1.succeed("! grep -F 'ERROR' /tmp/output.log")
node1.systemctl("daemon-reload") node1.systemctl("daemon-reload")
node1.systemctl("start default.target") node1.systemctl("start default.target")
node1.wait_for_unit("system-manager.target") node1.wait_for_unit("system-manager.target")
@ -211,15 +209,14 @@ forEachUbuntuImage
node1.succeed("grep -F 'launch_the_rockets = true' /etc/foo.conf") node1.succeed("grep -F 'launch_the_rockets = true' /etc/foo.conf")
node1.fail("grep -F 'launch_the_rockets = false' /etc/foo.conf") node1.fail("grep -F 'launch_the_rockets = false' /etc/foo.conf")
node1.succeed("${newConfig}/bin/activate 2>&1 | tee /tmp/output.log") ${system-manager.lib.activateProfileSnippet { node = "node1"; profile = newConfig; }}
node1.succeed("! grep -F 'ERROR' /tmp/output.log")
node1.succeed("systemctl status new-service.service") node1.succeed("systemctl status new-service.service")
node1.fail("systemctl status service-9.service") node1.fail("systemctl status service-9.service")
node1.fail("cat /etc/a/nested/example/foo3") node1.fail("cat /etc/a/nested/example/foo3")
node1.fail("cat /etc/baz/bar/foo2") node1.fail("cat /etc/baz/bar/foo2")
node1.succeed("cat /etc/foo_new") node1.succeed("cat /etc/foo_new")
node1.succeed("${newConfig}/bin/deactivate") ${system-manager.lib.deactivateProfileSnippet { node = "node1"; profile = newConfig; }}
node1.fail("systemctl status new-service.service") node1.fail("systemctl status new-service.service")
node1.fail("cat /etc/foo_new") node1.fail("cat /etc/foo_new")
''; '';
@ -258,19 +255,24 @@ forEachUbuntuImage
testScript = '' testScript = ''
# Start all machines in parallel # Start all machines in parallel
start_all() start_all()
node1.wait_for_unit("default.target")
${system-manager.lib.activateProfileSnippet "node1"} node1.fail("bash --login -c '$(which rg)'")
node1.fail("bash --login -c '$(which fd)'")
${system-manager.lib.activateProfileSnippet { node = "node1"; }}
node1.succeed("/system-manager-profile/bin/activate 2>&1 | tee /tmp/output.log")
node1.succeed("grep -vF 'ERROR' /tmp/output.log")
node1.wait_for_unit("system-manager.target") node1.wait_for_unit("system-manager.target")
node1.wait_for_unit("system-manager-path.service") node1.wait_for_unit("system-manager-path.service")
node1.fail("bash --login -c '$(which fish)'")
node1.succeed("bash --login -c 'realpath $(which rg) | grep -F ${hostPkgs.ripgrep}/bin/rg'") node1.succeed("bash --login -c 'realpath $(which rg) | grep -F ${hostPkgs.ripgrep}/bin/rg'")
node1.succeed("bash --login -c 'realpath $(which fd) | grep -F ${hostPkgs.fd}/bin/fd'") node1.succeed("bash --login -c 'realpath $(which fd) | grep -F ${hostPkgs.fd}/bin/fd'")
node1.succeed("${newConfig}/bin/activate 2>&1 | tee /tmp/output.log") ${system-manager.lib.activateProfileSnippet { node = "node1"; profile = newConfig; }}
node1.succeed("grep -vF 'ERROR' /tmp/output.log")
node1.fail("bash --login -c '$(which rg)'")
node1.fail("bash --login -c '$(which fd)'")
node1.succeed("bash --login -c 'realpath $(which fish) | grep -F ${hostPkgs.fish}/bin/fish'") node1.succeed("bash --login -c 'realpath $(which fish) | grep -F ${hostPkgs.fish}/bin/fish'")
''; '';
}) })