summary refs log tree commit diff
path: root/nixos/tests/hocker-fetchdocker/default.nix
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2020-08-24 11:50:58 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2020-08-24 11:50:58 +0200
commit0a874ff2a6dad9d2693f08a733d58f8077f36916 (patch)
tree80360888241c761769d9a1074fd96b22d7664598 /nixos/tests/hocker-fetchdocker/default.nix
parent91104b5417275b780f6947b46a5c1bcc0d99f10b (diff)
parentbc00ecedfa709f4fa91d445dd76ecd792cb2c728 (diff)
downloadnixpkgs-0a874ff2a6dad9d2693f08a733d58f8077f36916.tar
nixpkgs-0a874ff2a6dad9d2693f08a733d58f8077f36916.tar.gz
nixpkgs-0a874ff2a6dad9d2693f08a733d58f8077f36916.tar.bz2
nixpkgs-0a874ff2a6dad9d2693f08a733d58f8077f36916.tar.lz
nixpkgs-0a874ff2a6dad9d2693f08a733d58f8077f36916.tar.xz
nixpkgs-0a874ff2a6dad9d2693f08a733d58f8077f36916.tar.zst
nixpkgs-0a874ff2a6dad9d2693f08a733d58f8077f36916.zip
Merge master into staging-next
Diffstat (limited to 'nixos/tests/hocker-fetchdocker/default.nix')
-rw-r--r--nixos/tests/hocker-fetchdocker/default.nix9
1 files changed, 5 insertions, 4 deletions
diff --git a/nixos/tests/hocker-fetchdocker/default.nix b/nixos/tests/hocker-fetchdocker/default.nix
index 4f30f01e403..978dbf310b1 100644
--- a/nixos/tests/hocker-fetchdocker/default.nix
+++ b/nixos/tests/hocker-fetchdocker/default.nix
@@ -1,15 +1,16 @@
-import ../make-test.nix ({ pkgs, ...} : {
+import ../make-test-python.nix ({ pkgs, ...} : {
   name = "test-hocker-fetchdocker";
   meta = with pkgs.stdenv.lib.maintainers; {
     maintainers = [ ixmatus ];
+    broken = true; # tries to download from registry-1.docker.io - how did this ever work?
   };
 
   machine = import ./machine.nix;
 
   testScript = ''
-    startAll;
+    start_all()
 
-    $machine->waitForUnit("sockets.target");
-    $machine->waitUntilSucceeds("docker run registry-1.docker.io/v2/library/hello-world:latest");
+    machine.wait_for_unit("sockets.target")
+    machine.wait_until_succeeds("docker run registry-1.docker.io/v2/library/hello-world:latest")
   '';
 })