diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-19 09:19:50 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-19 09:19:50 +0100 |
| commit | f79e10061f4e7a8988831e9734e131492e5b311f (patch) | |
| tree | 8ae45d9a41e802f5339f46cd0d05b5f7cb31ffad /nixos/tests/postgis.nix | |
| parent | bf2877b9ab69caa83daf4191b13d903bc82ab337 (diff) | |
| parent | 7315dc071c901b83dfcacb5536f32699b2cb610a (diff) | |
| download | nixpkgs-f79e10061f4e7a8988831e9734e131492e5b311f.tar nixpkgs-f79e10061f4e7a8988831e9734e131492e5b311f.tar.gz nixpkgs-f79e10061f4e7a8988831e9734e131492e5b311f.tar.bz2 nixpkgs-f79e10061f4e7a8988831e9734e131492e5b311f.tar.lz nixpkgs-f79e10061f4e7a8988831e9734e131492e5b311f.tar.xz nixpkgs-f79e10061f4e7a8988831e9734e131492e5b311f.tar.zst nixpkgs-f79e10061f4e7a8988831e9734e131492e5b311f.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos/tests/postgis.nix')
| -rw-r--r-- | nixos/tests/postgis.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nixos/tests/postgis.nix b/nixos/tests/postgis.nix index 294eb50b5fe..84bbb0bc8ec 100644 --- a/nixos/tests/postgis.nix +++ b/nixos/tests/postgis.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ({ pkgs, ...} : { +import ./make-test-python.nix ({ pkgs, ...} : { name = "postgis"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ lsix ]; @@ -20,10 +20,10 @@ import ./make-test.nix ({ pkgs, ...} : { }; testScript = '' - startAll; - $master->waitForUnit("postgresql"); - $master->sleep(10); # Hopefully this is long enough!! - $master->succeed("sudo -u postgres psql -c 'CREATE EXTENSION postgis;'"); - $master->succeed("sudo -u postgres psql -c 'CREATE EXTENSION postgis_topology;'"); + start_all() + master.wait_for_unit("postgresql") + master.sleep(10) # Hopefully this is long enough!! + master.succeed("sudo -u postgres psql -c 'CREATE EXTENSION postgis;'") + master.succeed("sudo -u postgres psql -c 'CREATE EXTENSION postgis_topology;'") ''; }) |