Skip to content

Commit e734e7d

Browse files
committed
nixos-tests: wait_for_job -> wait_for_unit
wait_for_job was removed in NixOS/nixpkgs@884c63f
1 parent c087fed commit e734e7d

1 file changed

Lines changed: 12 additions & 12 deletions

File tree

nixos-tests.nix

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,11 @@ in
7575
nodes.server = serverConfig;
7676
nodes.builder = builderConfig;
7777
testScript = ''
78-
server.wait_for_job("hydra-init")
79-
server.wait_for_job("hydra-server")
80-
server.wait_for_job("hydra-evaluator")
81-
server.wait_for_job("hydra-queue-runner-dev")
82-
builder.wait_for_job("hydra-queue-builder-dev")
78+
server.wait_for_unit("hydra-init.service")
79+
server.wait_for_unit("hydra-server.service")
80+
server.wait_for_unit("hydra-evaluator.service")
81+
server.wait_for_unit("hydra-queue-runner-dev.service")
82+
builder.wait_for_unit("hydra-queue-builder-dev.service")
8383
server.wait_for_open_port(3000)
8484
server.succeed("curl --fail http://localhost:3000/")
8585
'';
@@ -104,9 +104,9 @@ in
104104
testScript =
105105
{ nodes, ... }:
106106
''
107-
server.wait_for_job("hydra-init")
108-
server.wait_for_job("hydra-queue-runner-dev")
109-
builder.wait_for_job("hydra-queue-builder-dev")
107+
server.wait_for_unit("hydra-init.service")
108+
server.wait_for_unit("hydra-queue-runner-dev.service")
109+
builder.wait_for_unit("hydra-queue-builder-dev.service")
110110
111111
# Create an admin account and some other state.
112112
server.succeed(
@@ -121,7 +121,7 @@ in
121121
)
122122
123123
# Wait until InfluxDB can receive web requests
124-
server.wait_for_job("influxdb")
124+
server.wait_for_unit("influxdb.service")
125125
server.wait_for_open_port(8086)
126126
127127
# Create an InfluxDB database where hydra will write to
@@ -131,7 +131,7 @@ in
131131
)
132132
133133
# Wait until hydra-server can receive HTTP requests
134-
server.wait_for_job("hydra-server")
134+
server.wait_for_unit("hydra-server.service")
135135
server.wait_for_open_port(3000)
136136
137137
# Setup the project and jobset
@@ -301,8 +301,8 @@ in
301301
server.start()
302302
builder.start()
303303
server.wait_for_unit("multi-user.target")
304-
server.wait_for_job("hydra-queue-runner-dev")
305-
builder.wait_for_job("hydra-queue-builder-dev")
304+
server.wait_for_unit("hydra-queue-runner-dev.service")
305+
builder.wait_for_unit("hydra-queue-builder-dev.service")
306306
server.wait_for_open_port(3000)
307307
server.wait_for_open_port(3001)
308308

0 commit comments

Comments
 (0)