commit c673e7ade966dc0371794eae2dcfb46830642a5a · pyrox.dev/nixpkgs

+1 -1

nixos/tests/all-tests.nix

···

       1295
       1295
        
         vscodium = discoverTests (import ./vscodium.nix);

     

       1296
       1296
        
         vsftpd = handleTest ./vsftpd.nix {};

     

       1297
       1297
        
         waagent = handleTest ./waagent.nix {};

     

       1298
       1298
       -
         wakapi = handleTest ./wakapi.nix {};

     

       1298
       1298
       +
         wakapi = runTest ./wakapi.nix;

     

       1299
       1299
        
         warzone2100 = handleTest ./warzone2100.nix {};

     

       1300
       1300
        
         wasabibackend = handleTest ./wasabibackend.nix {};

     

       1301
       1301
        
         wastebin = handleTest ./wastebin.nix {};

+52 -54

nixos/tests/wakapi.nix

···

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

     

       2
       2
       -
         { lib, ... }:

     

       3
       3
       -
         {

     

       4
       4
       -
           name = "Wakapi";

     

       1
       1
       +
       { lib, ... }:

     

       2
       2
       +
       {

     

       3
       3
       +
         name = "Wakapi";

     

       5
       4
        
       

     

       6
       6
       -
           nodes = {

     

       7
       7
       -
             wakapiPsql = {

     

       8
       8
       -
               services.wakapi = {

     

       9
       9
       -
                 enable = true;

     

       10
       10
       -
                 settings = {

     

       11
       11
       -
                   server.port = 3000; # upstream default, set explicitly in case upstream changes it

     

       12
       12
       -
                   db = {

     

       13
       13
       -
                     dialect = "postgres"; # `createLocally` only supports postgres

     

       14
       14
       -
                     host = "/run/postgresql";

     

       15
       15
       -
                     port = 5432; # service will fail if port is not set

     

       16
       16
       -
                     name = "wakapi";

     

       17
       17
       -
                     user = "wakapi";

     

       18
       18
       -
                   };

     

       5
       5
       +
         nodes = {

     

       6
       6
       +
           wakapiPsql = {

     

       7
       7
       +
             services.wakapi = {

     

       8
       8
       +
               enable = true;

     

       9
       9
       +
               settings = {

     

       10
       10
       +
                 server.port = 3000; # upstream default, set explicitly in case upstream changes it

     

       11
       11
       +
                 db = {

     

       12
       12
       +
                   dialect = "postgres"; # `createLocally` only supports postgres

     

       13
       13
       +
                   host = "/run/postgresql";

     

       14
       14
       +
                   port = 5432; # service will fail if port is not set

     

       15
       15
       +
                   name = "wakapi";

     

       16
       16
       +
                   user = "wakapi";

     

       19
       17
        
                 };

     

       18
       18
       +
               };

     

       20
       19
        
       

     

       21
       21
       -
                 # Automatically create our database

     

       22
       22
       -
                 database.createLocally = true; # only works with Postgresql for now

     

       20
       20
       +
               # Automatically create our database

     

       21
       21
       +
               database.createLocally = true; # only works with Postgresql for now

     

       23
       22
        
       

     

       24
       24
       -
                 # Created with `cat /dev/urandom | LC_ALL=C tr -dc 'a-zA-Z0-9' | fold -w ${1:-32} | head -n 1`

     

       25
       25
       -
                 # Prefer passwordSaltFile in production.

     

       26
       26
       -
                 passwordSalt = "NpqCY7eY7fMoIWYmPx5mAgr6YoSlXSuI";

     

       27
       27
       -
               };

     

       23
       23
       +
               # Created with `cat /dev/urandom | LC_ALL=C tr -dc 'a-zA-Z0-9' | fold -w ${1:-32} | head -n 1`

     

       24
       24
       +
               # Prefer passwordSaltFile in production.

     

       25
       25
       +
               passwordSalt = "NpqCY7eY7fMoIWYmPx5mAgr6YoSlXSuI";

     

       28
       26
        
             };

     

       27
       27
       +
           };

     

       29
       28
        
       

     

       30
       30
       -
             wakapiSqlite = {

     

       31
       31
       -
               services.wakapi = {

     

       32
       32
       -
                 enable = true;

     

       33
       33
       -
                 settings = {

     

       34
       34
       -
                   server.port = 3001;

     

       35
       35
       -
                   db = {

     

       36
       36
       -
                     dialect = "sqlite3";

     

       37
       37
       -
                     name = "wakapi";

     

       38
       38
       -
                     user = "wakapi";

     

       39
       39
       -
                   };

     

       29
       29
       +
           wakapiSqlite = {

     

       30
       30
       +
             services.wakapi = {

     

       31
       31
       +
               enable = true;

     

       32
       32
       +
               settings = {

     

       33
       33
       +
                 server.port = 3001;

     

       34
       34
       +
                 db = {

     

       35
       35
       +
                   dialect = "sqlite3";

     

       36
       36
       +
                   name = "wakapi";

     

       37
       37
       +
                   user = "wakapi";

     

       40
       38
        
                 };

     

       39
       39
       +
               };

     

       41
       40
        
       

     

       42
       42
       -
                 passwordSalt = "NpqCY7eY7fMoIWYmPx5mAgr6YoSlXSuI";

     

       43
       43
       -
               };

     

       41
       41
       +
               passwordSalt = "NpqCY7eY7fMoIWYmPx5mAgr6YoSlXSuI";

     

       44
       42
        
             };

     

       45
       43
        
           };

     

       44
       44
       +
         };

     

       46
       45
        
       

     

       47
       47
       -
           # Test that service works under both postgresql and sqlite3

     

       48
       48
       -
           # by starting all machines, and curling the default address.

     

       49
       49
       -
           # This is not very comprehensive for a test, but it should

     

       50
       50
       -
           # catch very basic mistakes in the module.

     

       51
       51
       -
           testScript = ''

     

       52
       52
       -
             with subtest("Test Wakapi with postgresql backend"):

     

       53
       53
       -
               wakapiPsql.start()

     

       54
       54
       -
               wakapiPsql.wait_for_unit("wakapi.service")

     

       55
       55
       -
               wakapiPsql.wait_for_open_port(3000)

     

       56
       56
       -
               wakapiPsql.succeed("curl --fail http://localhost:3000")

     

       46
       46
       +
         # Test that service works under both postgresql and sqlite3

     

       47
       47
       +
         # by starting all machines, and curling the default address.

     

       48
       48
       +
         # This is not very comprehensive for a test, but it should

     

       49
       49
       +
         # catch very basic mistakes in the module.

     

       50
       50
       +
         testScript = ''

     

       51
       51
       +
           with subtest("Test Wakapi with postgresql backend"):

     

       52
       52
       +
             wakapiPsql.start()

     

       53
       53
       +
             wakapiPsql.wait_for_unit("wakapi.service")

     

       54
       54
       +
             wakapiPsql.wait_for_open_port(3000)

     

       55
       55
       +
             wakapiPsql.succeed("curl --fail http://localhost:3000")

     

       57
       56
        
       

     

       58
       58
       -
             with subtest("Test Wakapi with sqlite3 backend"):

     

       59
       59
       -
               wakapiSqlite.start()

     

       60
       60
       -
               wakapiSqlite.wait_for_unit("wakapi.service")

     

       61
       61
       -
               wakapiSqlite.wait_for_open_port(3001)

     

       62
       62
       -
               wakapiSqlite.succeed("curl --fail http://localhost:3001")

     

       63
       63
       -
           '';

     

       57
       57
       +
           with subtest("Test Wakapi with sqlite3 backend"):

     

       58
       58
       +
             wakapiSqlite.start()

     

       59
       59
       +
             wakapiSqlite.wait_for_unit("wakapi.service")

     

       60
       60
       +
             wakapiSqlite.wait_for_open_port(3001)

     

       61
       61
       +
             wakapiSqlite.succeed("curl --fail http://localhost:3001")

     

       62
       62
       +
         '';

     

       64
       63
        
       

     

       65
       65
       -
           meta.maintainers = [ lib.maintainers.NotAShelf ];

     

       66
       66
       -
         }

     

       67
       67
       -
       )

     

       64
       64
       +
         meta.maintainers = [ lib.maintainers.NotAShelf ];

     

       65
       65
       +
       }