commit 9ef0e4580e9861371ac2e54139a94c795c7c0b45 · pyrox.dev/nixpkgs

+1 -1

nixos/tests/all-tests.nix

···

       511
       511
        
         gemstash = handleTest ./gemstash.nix { };

     

       512
       512
        
         geoclue2 = runTest ./geoclue2.nix;

     

       513
       513
        
         geoserver = runTest ./geoserver.nix;

     

       514
       514
       -
         gerrit = handleTest ./gerrit.nix { };

     

       514
       514
       +
         gerrit = runTest ./gerrit.nix;

     

       515
       515
        
         geth = handleTest ./geth.nix { };

     

       516
       516
        
         ghostunnel = handleTest ./ghostunnel.nix { };

     

       517
       517
        
         gitdaemon = handleTest ./gitdaemon.nix { };

+45 -47

nixos/tests/gerrit.nix

···

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

     

       2
       2
       -
         { pkgs, ... }:

     

       1
       1
       +
       { pkgs, ... }:

     

       3
       2
        
       

     

       4
       4
       -
         {

     

       5
       5
       -
           name = "gerrit";

     

       3
       3
       +
       {

     

       4
       4
       +
         name = "gerrit";

     

       6
       5
        
       

     

       7
       7
       -
           meta = with pkgs.lib.maintainers; {

     

       8
       8
       -
             maintainers = [

     

       9
       9
       -
               flokli

     

       10
       10
       -
               zimbatm

     

       11
       11
       -
             ];

     

       12
       12
       -
           };

     

       6
       6
       +
         meta = with pkgs.lib.maintainers; {

     

       7
       7
       +
           maintainers = [

     

       8
       8
       +
             flokli

     

       9
       9
       +
             zimbatm

     

       10
       10
       +
           ];

     

       11
       11
       +
         };

     

       13
       12
        
       

     

       14
       14
       -
           nodes = {

     

       15
       15
       -
             server =

     

       16
       16
       -
               { config, pkgs, ... }:

     

       17
       17
       -
               {

     

       18
       18
       -
                 networking.firewall.allowedTCPPorts = [

     

       19
       19
       -
                   80

     

       20
       20
       -
                   2222

     

       21
       21
       -
                 ];

     

       13
       13
       +
         nodes = {

     

       14
       14
       +
           server =

     

       15
       15
       +
             { config, pkgs, ... }:

     

       16
       16
       +
             {

     

       17
       17
       +
               networking.firewall.allowedTCPPorts = [

     

       18
       18
       +
                 80

     

       19
       19
       +
                 2222

     

       20
       20
       +
               ];

     

       22
       21
        
       

     

       23
       23
       -
                 services.gerrit = {

     

       24
       24
       -
                   enable = true;

     

       25
       25
       -
                   serverId = "aa76c84b-50b0-4711-a0a0-1ee30e45bbd0";

     

       26
       26
       -
                   listenAddress = "[::]:80";

     

       27
       27
       -
                   jvmHeapLimit = "1g";

     

       22
       22
       +
               services.gerrit = {

     

       23
       23
       +
                 enable = true;

     

       24
       24
       +
                 serverId = "aa76c84b-50b0-4711-a0a0-1ee30e45bbd0";

     

       25
       25
       +
                 listenAddress = "[::]:80";

     

       26
       26
       +
                 jvmHeapLimit = "1g";

     

       28
       27
        
       

     

       29
       29
       -
                   builtinPlugins = [

     

       30
       30
       -
                     "hooks"

     

       31
       31
       -
                     "webhooks"

     

       32
       32
       -
                   ];

     

       33
       33
       -
                   settings = {

     

       34
       34
       -
                     gerrit.canonicalWebUrl = "http://server";

     

       35
       35
       -
                     sshd.listenAddress = "[::]:2222";

     

       36
       36
       -
                     sshd.advertisedAddress = "[::]:2222";

     

       37
       37
       -
                   };

     

       28
       28
       +
                 builtinPlugins = [

     

       29
       29
       +
                   "hooks"

     

       30
       30
       +
                   "webhooks"

     

       31
       31
       +
                 ];

     

       32
       32
       +
                 settings = {

     

       33
       33
       +
                   gerrit.canonicalWebUrl = "http://server";

     

       34
       34
       +
                   sshd.listenAddress = "[::]:2222";

     

       35
       35
       +
                   sshd.advertisedAddress = "[::]:2222";

     

       38
       36
        
                 };

     

       39
       37
        
               };

     

       38
       38
       +
             };

     

       40
       39
        
       

     

       41
       41
       -
             client =

     

       42
       42
       -
               { ... }:

     

       43
       43
       -
               {

     

       44
       44
       -
               };

     

       45
       45
       -
           };

     

       40
       40
       +
           client =

     

       41
       41
       +
             { ... }:

     

       42
       42
       +
             {

     

       43
       43
       +
             };

     

       44
       44
       +
         };

     

       46
       45
        
       

     

       47
       47
       -
           testScript = ''

     

       48
       48
       -
             start_all()

     

       49
       49
       -
             server.wait_for_unit("gerrit.service")

     

       50
       50
       -
             server.wait_for_open_port(80)

     

       51
       51
       -
             client.succeed("curl http://server")

     

       46
       46
       +
         testScript = ''

     

       47
       47
       +
           start_all()

     

       48
       48
       +
           server.wait_for_unit("gerrit.service")

     

       49
       49
       +
           server.wait_for_open_port(80)

     

       50
       50
       +
           client.succeed("curl http://server")

     

       52
       51
        
       

     

       53
       53
       -
             server.wait_for_open_port(2222)

     

       54
       54
       -
             client.succeed("nc -z server 2222")

     

       55
       55
       -
           '';

     

       56
       56
       -
         }

     

       57
       57
       -
       )

     

       52
       52
       +
           server.wait_for_open_port(2222)

     

       53
       53
       +
           client.succeed("nc -z server 2222")

     

       54
       54
       +
         '';

     

       55
       55
       +
       }