commit bd49230ea4640dc22f167777f31195e443c0451a · pyrox.dev/nixpkgs

+1 -1

nixos/tests/all-tests.nix

···

       1175
       1175
        
         rustls-libssl = handleTest ./rustls-libssl.nix { };

     

       1176
       1176
        
         rxe = handleTest ./rxe.nix { };

     

       1177
       1177
        
         sabnzbd = handleTest ./sabnzbd.nix { };

     

       1178
       1178
       -
         samba = handleTest ./samba.nix { };

     

       1178
       1178
       +
         samba = runTest ./samba.nix;

     

       1179
       1179
        
         samba-wsdd = handleTest ./samba-wsdd.nix { };

     

       1180
       1180
        
         sane = handleTest ./sane.nix { };

     

       1181
       1181
        
         sanoid = handleTest ./sanoid.nix { };

+38 -40

nixos/tests/samba.nix

···

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

     

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

     

       3
       3
       -
         {

     

       4
       4
       -
           name = "samba";

     

       1
       1
       +
       { lib, ... }:

     

       2
       2
       +
       {

     

       3
       3
       +
         name = "samba";

     

       5
       4
        
       

     

       6
       6
       -
           meta.maintainers = [ lib.maintainers.anthonyroussel ];

     

       5
       5
       +
         meta.maintainers = [ lib.maintainers.anthonyroussel ];

     

       7
       6
        
       

     

       8
       8
       -
           nodes = {

     

       9
       9
       -
             client =

     

       10
       10
       -
               { ... }:

     

       11
       11
       -
               {

     

       12
       12
       -
                 virtualisation.fileSystems = {

     

       13
       13
       -
                   "/public" = {

     

       14
       14
       -
                     fsType = "cifs";

     

       15
       15
       -
                     device = "//server/public";

     

       16
       16
       -
                     options = [ "guest" ];

     

       17
       17
       -
                   };

     

       7
       7
       +
         nodes = {

     

       8
       8
       +
           client =

     

       9
       9
       +
             { ... }:

     

       10
       10
       +
             {

     

       11
       11
       +
               virtualisation.fileSystems = {

     

       12
       12
       +
                 "/public" = {

     

       13
       13
       +
                   fsType = "cifs";

     

       14
       14
       +
                   device = "//server/public";

     

       15
       15
       +
                   options = [ "guest" ];

     

       18
       16
        
                 };

     

       19
       17
        
               };

     

       18
       18
       +
             };

     

       20
       19
        
       

     

       21
       21
       -
             server =

     

       22
       22
       -
               { ... }:

     

       23
       23
       -
               {

     

       24
       24
       -
                 services.samba = {

     

       25
       25
       -
                   enable = true;

     

       26
       26
       -
                   openFirewall = true;

     

       27
       27
       -
                   settings = {

     

       28
       28
       -
                     "public" = {

     

       29
       29
       -
                       "path" = "/public";

     

       30
       30
       -
                       "read only" = true;

     

       31
       31
       -
                       "browseable" = "yes";

     

       32
       32
       -
                       "guest ok" = "yes";

     

       33
       33
       -
                       "comment" = "Public samba share.";

     

       34
       34
       -
                     };

     

       20
       20
       +
           server =

     

       21
       21
       +
             { ... }:

     

       22
       22
       +
             {

     

       23
       23
       +
               services.samba = {

     

       24
       24
       +
                 enable = true;

     

       25
       25
       +
                 openFirewall = true;

     

       26
       26
       +
                 settings = {

     

       27
       27
       +
                   "public" = {

     

       28
       28
       +
                     "path" = "/public";

     

       29
       29
       +
                     "read only" = true;

     

       30
       30
       +
                     "browseable" = "yes";

     

       31
       31
       +
                     "guest ok" = "yes";

     

       32
       32
       +
                     "comment" = "Public samba share.";

     

       35
       33
        
                   };

     

       36
       34
        
                 };

     

       37
       35
        
               };

     

       38
       38
       -
           };

     

       36
       36
       +
             };

     

       37
       37
       +
         };

     

       39
       38
        
       

     

       40
       40
       -
           testScript = ''

     

       41
       41
       -
             server.start()

     

       42
       42
       -
             server.wait_for_unit("samba.target")

     

       43
       43
       -
             server.succeed("mkdir -p /public; echo bar > /public/foo")

     

       39
       39
       +
         testScript = ''

     

       40
       40
       +
           server.start()

     

       41
       41
       +
           server.wait_for_unit("samba.target")

     

       42
       42
       +
           server.succeed("mkdir -p /public; echo bar > /public/foo")

     

       44
       43
        
       

     

       45
       45
       -
             client.start()

     

       46
       46
       -
             client.wait_for_unit("remote-fs.target")

     

       47
       47
       -
             client.succeed("[[ $(cat /public/foo) = bar ]]")

     

       48
       48
       -
           '';

     

       49
       49
       -
         }

     

       50
       50
       -
       )

     

       44
       44
       +
           client.start()

     

       45
       45
       +
           client.wait_for_unit("remote-fs.target")

     

       46
       46
       +
           client.succeed("[[ $(cat /public/foo) = bar ]]")

     

       47
       47
       +
         '';

     

       48
       48
       +
       }