diff options
author | aszlig <aszlig@redmoonstudios.org> | 2016-04-12 05:38:37 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2016-04-12 05:38:37 +0200 |
commit | e2383b84f88e0e7d35f6a3a846b54c69e3bee6ee (patch) | |
tree | b8eeec21466326a272239931dcafc292c74c47bb /nixos/tests | |
parent | ce0954020c71007b7a9ec2822949d31f18aea170 (diff) | |
download | nixlib-e2383b84f88e0e7d35f6a3a846b54c69e3bee6ee.tar nixlib-e2383b84f88e0e7d35f6a3a846b54c69e3bee6ee.tar.gz nixlib-e2383b84f88e0e7d35f6a3a846b54c69e3bee6ee.tar.bz2 nixlib-e2383b84f88e0e7d35f6a3a846b54c69e3bee6ee.tar.lz nixlib-e2383b84f88e0e7d35f6a3a846b54c69e3bee6ee.tar.xz nixlib-e2383b84f88e0e7d35f6a3a846b54c69e3bee6ee.tar.zst nixlib-e2383b84f88e0e7d35f6a3a846b54c69e3bee6ee.zip |
nixos/taskserver/helper: Improve CLI subcommands
Try to match the subcommands to act more like the subcommands from the taskd binary and also add a subcommand to list groups. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'nixos/tests')
-rw-r--r-- | nixos/tests/taskserver.nix | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/nixos/tests/taskserver.nix b/nixos/tests/taskserver.nix index 0521f97431b3..d770b20a7757 100644 --- a/nixos/tests/taskserver.nix +++ b/nixos/tests/taskserver.nix @@ -44,7 +44,7 @@ import ./make-test.nix { ); my $exportinfo = $server->succeed( - "nixos-taskserver export-user $org $user" + "nixos-taskserver user export $org $user" ); $exportinfo =~ s/'/'\\'''/g; @@ -74,10 +74,10 @@ import ./make-test.nix { sub readdImperativeUser { $server->nest("(re-)add imperative user bar", sub { - $server->execute("nixos-taskserver del-org imperativeOrg"); + $server->execute("nixos-taskserver org remove imperativeOrg"); $server->succeed( - "nixos-taskserver add-org imperativeOrg", - "nixos-taskserver add-user imperativeOrg bar" + "nixos-taskserver org add imperativeOrg", + "nixos-taskserver user add imperativeOrg bar" ); setupClientsFor "imperativeOrg", "bar"; }); @@ -109,9 +109,9 @@ import ./make-test.nix { $server->waitForUnit("taskserver.service"); $server->succeed( - "nixos-taskserver list-users testOrganisation | grep -qxF alice", - "nixos-taskserver list-users testOrganisation | grep -qxF foo", - "nixos-taskserver list-users anotherOrganisation | grep -qxF bob" + "nixos-taskserver user list testOrganisation | grep -qxF alice", + "nixos-taskserver user list testOrganisation | grep -qxF foo", + "nixos-taskserver user list anotherOrganisation | grep -qxF bob" ); $server->waitForOpenPort(${portStr}); @@ -125,7 +125,7 @@ import ./make-test.nix { testSync $_ for ("alice", "bob", "foo"); - $server->fail("nixos-taskserver add-user imperativeOrg bar"); + $server->fail("nixos-taskserver user add imperativeOrg bar"); readdImperativeUser; testSync "bar"; @@ -133,7 +133,7 @@ import ./make-test.nix { subtest "checking certificate revocation of user bar", sub { $client1->succeed(checkClientCert "bar"); - $server->succeed("nixos-taskserver del-user imperativeOrg bar"); + $server->succeed("nixos-taskserver user remove imperativeOrg bar"); restartServer; $client1->fail(checkClientCert "bar"); @@ -147,7 +147,7 @@ import ./make-test.nix { subtest "checking certificate revocation of org imperativeOrg", sub { $client1->succeed(checkClientCert "bar"); - $server->succeed("nixos-taskserver del-org imperativeOrg"); + $server->succeed("nixos-taskserver org remove imperativeOrg"); restartServer; $client1->fail(checkClientCert "bar"); |