commit 743cd3dfaf9d9c4a2573a506584c41cf57e738f0 · pyrox.dev/nixpkgs

+1 -1

nixos/tests/all-tests.nix

···

       870
       870
        
         peering-manager = handleTest ./web-apps/peering-manager.nix {};

     

       871
       871
        
         peertube = handleTestOn ["x86_64-linux"] ./web-apps/peertube.nix {};

     

       872
       872
        
         peroxide = handleTest ./peroxide.nix {};

     

       873
       873
       -
         pgadmin4 = handleTest ./pgadmin4.nix {};

     

       873
       873
       +
         pgadmin4 = runTest ./pgadmin4.nix;

     

       874
       874
        
         pgbouncer = handleTest ./pgbouncer.nix {};

     

       875
       875
        
         pghero = runTest ./pghero.nix;

     

       876
       876
        
         pgweb = runTest ./pgweb.nix;

+72 -74

nixos/tests/pgadmin4.nix

···

       1
       1
       -
       import ./make-test-python.nix (

     

       2
       2
       -
         { pkgs, lib, ... }:

     

       1
       1
       +
       { lib, ... }:

     

       3
       2
        
       

     

       4
       4
       -
         {

     

       5
       5
       -
           name = "pgadmin4";

     

       6
       6
       -
           meta.maintainers = with lib.maintainers; [

     

       7
       7
       -
             mkg20001

     

       8
       8
       -
             gador

     

       9
       9
       -
           ];

     

       3
       3
       +
       {

     

       4
       4
       +
         name = "pgadmin4";

     

       5
       5
       +
         meta.maintainers = with lib.maintainers; [

     

       6
       6
       +
           mkg20001

     

       7
       7
       +
           gador

     

       8
       8
       +
         ];

     

       10
       9
        
       

     

       11
       11
       -
           nodes = {

     

       12
       12
       -
             machine =

     

       13
       13
       -
               { pkgs, ... }:

     

       14
       14
       -
               {

     

       10
       10
       +
         nodes = {

     

       11
       11
       +
           machine =

     

       12
       12
       +
             { pkgs, ... }:

     

       13
       13
       +
             {

     

       15
       14
        
       

     

       16
       16
       -
                 imports = [ ./common/user-account.nix ];

     

       15
       15
       +
               imports = [ ./common/user-account.nix ];

     

       17
       16
        
       

     

       18
       18
       -
                 environment.systemPackages = with pkgs; [

     

       19
       19
       -
                   wget

     

       20
       20
       -
                   curl

     

       21
       21
       -
                   pgadmin4-desktopmode

     

       22
       22
       -
                 ];

     

       17
       17
       +
               environment.systemPackages = with pkgs; [

     

       18
       18
       +
                 wget

     

       19
       19
       +
                 curl

     

       20
       20
       +
                 pgadmin4-desktopmode

     

       21
       21
       +
               ];

     

       23
       22
        
       

     

       24
       24
       -
                 services.postgresql = {

     

       25
       25
       -
                   enable = true;

     

       26
       26
       -
                   authentication = ''

     

       27
       27
       -
                     host    all             all             localhost               trust

     

       28
       28
       -
                   '';

     

       29
       29
       -
                 };

     

       23
       23
       +
               services.postgresql = {

     

       24
       24
       +
                 enable = true;

     

       25
       25
       +
                 authentication = ''

     

       26
       26
       +
                   host    all             all             localhost               trust

     

       27
       27
       +
                 '';

     

       28
       28
       +
               };

     

       30
       29
        
       

     

       31
       31
       -
                 services.pgadmin = {

     

       32
       32
       -
                   port = 5051;

     

       33
       33
       -
                   enable = true;

     

       34
       34
       -
                   initialEmail = "bruh@localhost.de";

     

       35
       35
       -
                   initialPasswordFile = pkgs.writeText "pw" "bruh2012!";

     

       36
       36
       -
                 };

     

       30
       30
       +
               services.pgadmin = {

     

       31
       31
       +
                 port = 5051;

     

       32
       32
       +
                 enable = true;

     

       33
       33
       +
                 initialEmail = "bruh@localhost.de";

     

       34
       34
       +
                 initialPasswordFile = pkgs.writeText "pw" "bruh2012!";

     

       37
       35
        
               };

     

       38
       38
       -
             machine2 =

     

       39
       39
       -
               { pkgs, ... }:

     

       40
       40
       -
               {

     

       36
       36
       +
             };

     

       37
       37
       +
           machine2 =

     

       38
       38
       +
             { pkgs, ... }:

     

       39
       39
       +
             {

     

       41
       40
        
       

     

       42
       42
       -
                 imports = [ ./common/user-account.nix ];

     

       41
       41
       +
               imports = [ ./common/user-account.nix ];

     

       43
       42
        
       

     

       44
       44
       -
                 services.postgresql = {

     

       45
       45
       -
                   enable = true;

     

       46
       46
       -
                 };

     

       43
       43
       +
               services.postgresql = {

     

       44
       44
       +
                 enable = true;

     

       45
       45
       +
               };

     

       47
       46
        
       

     

       48
       48
       -
                 services.pgadmin = {

     

       49
       49
       -
                   enable = true;

     

       50
       50
       -
                   initialEmail = "bruh@localhost.de";

     

       51
       51
       -
                   initialPasswordFile = pkgs.writeText "pw" "bruh2012!";

     

       52
       52
       -
                   minimumPasswordLength = 12;

     

       53
       53
       -
                 };

     

       47
       47
       +
               services.pgadmin = {

     

       48
       48
       +
                 enable = true;

     

       49
       49
       +
                 initialEmail = "bruh@localhost.de";

     

       50
       50
       +
                 initialPasswordFile = pkgs.writeText "pw" "bruh2012!";

     

       51
       51
       +
                 minimumPasswordLength = 12;

     

       54
       52
        
               };

     

       55
       55
       -
           };

     

       53
       53
       +
             };

     

       54
       54
       +
         };

     

       56
       55
        
       

     

       57
       57
       -
           testScript = ''

     

       58
       58
       -
             with subtest("Check pgadmin module"):

     

       59
       59
       -
               machine.wait_for_unit("postgresql")

     

       60
       60
       -
               machine.wait_for_unit("pgadmin")

     

       61
       61
       -
               machine.wait_until_succeeds("curl -sS localhost:5051")

     

       62
       62
       -
               machine.wait_until_succeeds("curl -sS localhost:5051/login | grep \"<title>pgAdmin 4</title>\" > /dev/null")

     

       63
       63
       -
               # check for missing support files (css, js etc). Should catch not-generated files during build. See e.g. https://github.com/NixOS/nixpkgs/pull/229184

     

       64
       64
       -
               machine.succeed("wget -nv --level=1 --spider --recursive localhost:5051/login")

     

       65
       65
       -
               # test idempotenceny

     

       66
       66
       -
               machine.systemctl("restart pgadmin.service")

     

       67
       67
       -
               machine.wait_for_unit("pgadmin")

     

       68
       68
       -
               machine.wait_until_succeeds("curl -sS localhost:5051")

     

       69
       69
       -
               machine.wait_until_succeeds("curl -sS localhost:5051/login | grep \"<title>pgAdmin 4</title>\" > /dev/null")

     

       56
       56
       +
         testScript = ''

     

       57
       57
       +
           with subtest("Check pgadmin module"):

     

       58
       58
       +
             machine.wait_for_unit("postgresql")

     

       59
       59
       +
             machine.wait_for_unit("pgadmin")

     

       60
       60
       +
             machine.wait_until_succeeds("curl -sS localhost:5051")

     

       61
       61
       +
             machine.wait_until_succeeds("curl -sS localhost:5051/login | grep \"<title>pgAdmin 4</title>\" > /dev/null")

     

       62
       62
       +
             # check for missing support files (css, js etc). Should catch not-generated files during build. See e.g. https://github.com/NixOS/nixpkgs/pull/229184

     

       63
       63
       +
             machine.succeed("wget -nv --level=1 --spider --recursive localhost:5051/login")

     

       64
       64
       +
             # test idempotenceny

     

       65
       65
       +
             machine.systemctl("restart pgadmin.service")

     

       66
       66
       +
             machine.wait_for_unit("pgadmin")

     

       67
       67
       +
             machine.wait_until_succeeds("curl -sS localhost:5051")

     

       68
       68
       +
             machine.wait_until_succeeds("curl -sS localhost:5051/login | grep \"<title>pgAdmin 4</title>\" > /dev/null")

     

       70
       69
        
       

     

       71
       71
       -
             # pgadmin4 module saves the configuration to /etc/pgadmin/config_system.py

     

       72
       72
       -
             # pgadmin4-desktopmode tries to read that as well. This normally fails with a PermissionError, as the config file

     

       73
       73
       -
             # is owned by the user of the pgadmin module. With the check-system-config-dir.patch this will just throw a warning

     

       74
       74
       -
             # but will continue and not read the file.

     

       75
       75
       -
             # If we run pgadmin4-desktopmode as root (something one really shouldn't do), it can read the config file and fail,

     

       76
       76
       -
             # because of the wrong config for desktopmode.

     

       77
       77
       -
             with subtest("Check pgadmin standalone desktop mode"):

     

       78
       78
       -
               machine.execute("sudo -u alice pgadmin4 >&2 &", timeout=60)

     

       79
       79
       -
               machine.wait_until_succeeds("curl -sS localhost:5050")

     

       80
       80
       -
               machine.wait_until_succeeds("curl -sS localhost:5050/browser/ | grep \"<title>pgAdmin 4</title>\" > /dev/null")

     

       81
       81
       -
               machine.succeed("wget -nv --level=1 --spider --recursive localhost:5050/browser")

     

       70
       70
       +
           # pgadmin4 module saves the configuration to /etc/pgadmin/config_system.py

     

       71
       71
       +
           # pgadmin4-desktopmode tries to read that as well. This normally fails with a PermissionError, as the config file

     

       72
       72
       +
           # is owned by the user of the pgadmin module. With the check-system-config-dir.patch this will just throw a warning

     

       73
       73
       +
           # but will continue and not read the file.

     

       74
       74
       +
           # If we run pgadmin4-desktopmode as root (something one really shouldn't do), it can read the config file and fail,

     

       75
       75
       +
           # because of the wrong config for desktopmode.

     

       76
       76
       +
           with subtest("Check pgadmin standalone desktop mode"):

     

       77
       77
       +
             machine.execute("sudo -u alice pgadmin4 >&2 &", timeout=60)

     

       78
       78
       +
             machine.wait_until_succeeds("curl -sS localhost:5050")

     

       79
       79
       +
             machine.wait_until_succeeds("curl -sS localhost:5050/browser/ | grep \"<title>pgAdmin 4</title>\" > /dev/null")

     

       80
       80
       +
             machine.succeed("wget -nv --level=1 --spider --recursive localhost:5050/browser")

     

       82
       81
        
       

     

       83
       83
       -
             with subtest("Check pgadmin minimum password length"):

     

       84
       84
       -
               machine2.wait_for_unit("postgresql")

     

       85
       85
       -
               machine2.wait_for_console_text("Password must be at least 12 characters long")

     

       86
       86
       -
           '';

     

       87
       87
       -
         }

     

       88
       88
       -
       )

     

       82
       82
       +
           with subtest("Check pgadmin minimum password length"):

     

       83
       83
       +
             machine2.wait_for_unit("postgresql")

     

       84
       84
       +
             machine2.wait_for_console_text("Password must be at least 12 characters long")

     

       85
       85
       +
         '';

     

       86
       86
       +
       }