commit e9a7bc917c3f5140b96995ee5cca9c71b7bbac5a · pyrox.dev/nixpkgs

+1 -1

nixos/tests/all-tests.nix

···

       675
       675
        
         keycloak = discoverTests (import ./keycloak.nix);

     

       676
       676
        
         keyd = handleTest ./keyd.nix { };

     

       677
       677
        
         keymap = handleTest ./keymap.nix { };

     

       678
       678
       -
         kimai = handleTest ./kimai.nix { };

     

       678
       678
       +
         kimai = runTest ./kimai.nix;

     

       679
       679
        
         kmonad = runTest ./kmonad.nix;

     

       680
       680
        
         knot = runTest ./knot.nix;

     

       681
       681
        
         komga = handleTest ./komga.nix { };

+17 -19

nixos/tests/kimai.nix

···

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

     

       2
       2
       -
         { lib, ... }:

     

       1
       1
       +
       { lib, ... }:

     

       3
       2
        
       

     

       4
       4
       -
         {

     

       5
       5
       -
           name = "kimai";

     

       6
       6
       -
           meta.maintainers = with lib.maintainers; [ peat-psuwit ];

     

       3
       3
       +
       {

     

       4
       4
       +
         name = "kimai";

     

       5
       5
       +
         meta.maintainers = with lib.maintainers; [ peat-psuwit ];

     

       7
       6
        
       

     

       8
       8
       -
           nodes.machine =

     

       9
       9
       -
             { ... }:

     

       10
       10
       -
             {

     

       11
       11
       -
               services.kimai.sites."localhost" = {

     

       12
       12
       -
                 database.createLocally = true;

     

       13
       13
       -
               };

     

       7
       7
       +
         nodes.machine =

     

       8
       8
       +
           { ... }:

     

       9
       9
       +
           {

     

       10
       10
       +
             services.kimai.sites."localhost" = {

     

       11
       11
       +
               database.createLocally = true;

     

       14
       12
        
             };

     

       13
       13
       +
           };

     

       15
       14
        
       

     

       16
       16
       -
           testScript = ''

     

       17
       17
       -
             machine.wait_for_unit("phpfpm-kimai-localhost.service")

     

       18
       18
       -
             machine.wait_for_unit("nginx.service")

     

       19
       19
       -
             machine.wait_for_open_port(80)

     

       20
       20
       -
             machine.succeed("curl -v --location --fail http://localhost/")

     

       21
       21
       -
           '';

     

       22
       22
       -
         }

     

       23
       23
       -
       )

     

       15
       15
       +
         testScript = ''

     

       16
       16
       +
           machine.wait_for_unit("phpfpm-kimai-localhost.service")

     

       17
       17
       +
           machine.wait_for_unit("nginx.service")

     

       18
       18
       +
           machine.wait_for_open_port(80)

     

       19
       19
       +
           machine.succeed("curl -v --location --fail http://localhost/")

     

       20
       20
       +
         '';

     

       21
       21
       +
       }