commit 89e464c751ebf3d068677ed50a5cac7b0d165dec · pyrox.dev/nixpkgs

+1 -1

nixos/tests/all-tests.nix

···

       813
       813
        
         nginx-sso = runTest ./nginx-sso.nix;

     

       814
       814
        
         nginx-status-page = runTest ./nginx-status-page.nix;

     

       815
       815
        
         nginx-tmpdir = runTest ./nginx-tmpdir.nix;

     

       816
       816
       -
         nginx-unix-socket = handleTest ./nginx-unix-socket.nix {};

     

       816
       816
       +
         nginx-unix-socket = runTest ./nginx-unix-socket.nix;

     

       817
       817
        
         nginx-variants = handleTest ./nginx-variants.nix {};

     

       818
       818
        
         nifi = runTestOn ["x86_64-linux"] ./web-apps/nifi.nix;

     

       819
       819
        
         nitter = handleTest ./nitter.nix {};

+24 -26

nixos/tests/nginx-unix-socket.nix

···

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

     

       2
       2
       -
         { pkgs, ... }:

     

       3
       3
       -
         let

     

       4
       4
       -
           nginxSocketPath = "/var/run/nginx/test.sock";

     

       5
       5
       -
         in

     

       6
       6
       -
         {

     

       7
       7
       -
           name = "nginx-unix-socket";

     

       1
       1
       +
       { ... }:

     

       2
       2
       +
       let

     

       3
       3
       +
         nginxSocketPath = "/var/run/nginx/test.sock";

     

       4
       4
       +
       in

     

       5
       5
       +
       {

     

       6
       6
       +
         name = "nginx-unix-socket";

     

       8
       7
        
       

     

       9
       9
       -
           nodes = {

     

       10
       10
       -
             webserver =

     

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

     

       12
       12
       -
               {

     

       13
       13
       -
                 services.nginx = {

     

       14
       14
       -
                   enable = true;

     

       15
       15
       -
                   virtualHosts.localhost = {

     

       16
       16
       -
                     serverName = "localhost";

     

       17
       17
       -
                     listen = [ { addr = "unix:${nginxSocketPath}"; } ];

     

       18
       18
       -
                     locations."/test".return = "200 'foo'";

     

       19
       19
       -
                   };

     

       8
       8
       +
         nodes = {

     

       9
       9
       +
           webserver =

     

       10
       10
       +
             { pkgs, lib, ... }:

     

       11
       11
       +
             {

     

       12
       12
       +
               services.nginx = {

     

       13
       13
       +
                 enable = true;

     

       14
       14
       +
                 virtualHosts.localhost = {

     

       15
       15
       +
                   serverName = "localhost";

     

       16
       16
       +
                   listen = [ { addr = "unix:${nginxSocketPath}"; } ];

     

       17
       17
       +
                   locations."/test".return = "200 'foo'";

     

       20
       18
        
                 };

     

       21
       19
        
               };

     

       22
       22
       -
           };

     

       20
       20
       +
             };

     

       21
       21
       +
         };

     

       23
       22
        
       

     

       24
       24
       -
           testScript = ''

     

       25
       25
       -
             webserver.wait_for_unit("nginx")

     

       26
       26
       -
             webserver.wait_for_open_unix_socket("${nginxSocketPath}")

     

       23
       23
       +
         testScript = ''

     

       24
       24
       +
           webserver.wait_for_unit("nginx")

     

       25
       25
       +
           webserver.wait_for_open_unix_socket("${nginxSocketPath}")

     

       27
       26
        
       

     

       28
       28
       -
             webserver.succeed("curl --fail --silent --unix-socket '${nginxSocketPath}' http://localhost/test | grep '^foo$'")

     

       29
       29
       -
           '';

     

       30
       30
       -
         }

     

       31
       31
       -
       )

     

       27
       27
       +
           webserver.succeed("curl --fail --silent --unix-socket '${nginxSocketPath}' http://localhost/test | grep '^foo$'")

     

       28
       28
       +
         '';

     

       29
       29
       +
       }