commit 913252c5aa30fcd838d9fc9f4cf5646dab2a803e · pyrox.dev/nixpkgs

+1 -1

nixos/tests/all-tests.nix

···

       1454
       1454
        
         tracee = handleTestOn [ "x86_64-linux" ] ./tracee.nix { };

     

       1455
       1455
        
         trezord = runTest ./trezord.nix;

     

       1456
       1456
        
         trickster = runTest ./trickster.nix;

     

       1457
       1457
       -
         trilium-server = handleTestOn [ "x86_64-linux" ] ./trilium-server.nix { };

     

       1457
       1457
       +
         trilium-server = runTestOn [ "x86_64-linux" ] ./trilium-server.nix;

     

       1458
       1458
        
         tsm-client-gui = runTest ./tsm-client-gui.nix;

     

       1459
       1459
        
         ttyd = runTest ./web-servers/ttyd.nix;

     

       1460
       1460
        
         tt-rss = runTest ./web-apps/tt-rss.nix;

+41 -44

nixos/tests/trilium-server.nix

···

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

     

       2
       2
       -
         { ... }:

     

       3
       3
       -
         {

     

       4
       4
       -
           name = "trilium-server";

     

       5
       5
       -
           nodes = {

     

       6
       6
       -
             default = {

     

       7
       7
       -
               services.trilium-server.enable = true;

     

       1
       1
       +
       {

     

       2
       2
       +
         name = "trilium-server";

     

       3
       3
       +
         nodes = {

     

       4
       4
       +
           default = {

     

       5
       5
       +
             services.trilium-server.enable = true;

     

       6
       6
       +
           };

     

       7
       7
       +
           configured = {

     

       8
       8
       +
             services.trilium-server = {

     

       9
       9
       +
               enable = true;

     

       10
       10
       +
               dataDir = "/data/trilium";

     

       8
       11
        
             };

     

       9
       9
       -
             configured = {

     

       10
       10
       -
               services.trilium-server = {

     

       11
       11
       -
                 enable = true;

     

       12
       12
       -
                 dataDir = "/data/trilium";

     

       13
       13
       -
               };

     

       14
       14
       -
             };

     

       12
       12
       +
           };

     

       15
       13
        
       

     

       16
       16
       -
             nginx = {

     

       17
       17
       -
               services.trilium-server = {

     

       18
       18
       -
                 enable = true;

     

       19
       19
       -
                 nginx.enable = true;

     

       20
       20
       -
                 nginx.hostName = "trilium.example.com";

     

       21
       21
       -
               };

     

       14
       14
       +
           nginx = {

     

       15
       15
       +
             services.trilium-server = {

     

       16
       16
       +
               enable = true;

     

       17
       17
       +
               nginx.enable = true;

     

       18
       18
       +
               nginx.hostName = "trilium.example.com";

     

       22
       19
        
             };

     

       23
       20
        
           };

     

       21
       21
       +
         };

     

       24
       22
        
       

     

       25
       25
       -
           testScript = ''

     

       26
       26
       -
             start_all()

     

       23
       23
       +
         testScript = ''

     

       24
       24
       +
           start_all()

     

       27
       25
        
       

     

       28
       28
       -
             with subtest("by default works without configuration"):

     

       29
       29
       -
                 default.wait_for_unit("trilium-server.service")

     

       26
       26
       +
           with subtest("by default works without configuration"):

     

       27
       27
       +
               default.wait_for_unit("trilium-server.service")

     

       30
       28
        
       

     

       31
       31
       -
             with subtest("by default available on port 8080"):

     

       32
       32
       -
                 default.wait_for_unit("trilium-server.service")

     

       33
       33
       -
                 default.wait_for_open_port(8080)

     

       34
       34
       -
                 # we output to /dev/null here to avoid a python UTF-8 decode error

     

       35
       35
       -
                 # but the check will still fail if the service doesn't respond

     

       36
       36
       -
                 default.succeed("curl --fail -o /dev/null 127.0.0.1:8080")

     

       29
       29
       +
           with subtest("by default available on port 8080"):

     

       30
       30
       +
               default.wait_for_unit("trilium-server.service")

     

       31
       31
       +
               default.wait_for_open_port(8080)

     

       32
       32
       +
               # we output to /dev/null here to avoid a python UTF-8 decode error

     

       33
       33
       +
               # but the check will still fail if the service doesn't respond

     

       34
       34
       +
               default.succeed("curl --fail -o /dev/null 127.0.0.1:8080")

     

       37
       35
        
       

     

       38
       38
       -
             with subtest("by default creates empty document"):

     

       39
       39
       -
                 default.wait_for_unit("trilium-server.service")

     

       40
       40
       -
                 default.succeed("test -f /var/lib/trilium/document.db")

     

       36
       36
       +
           with subtest("by default creates empty document"):

     

       37
       37
       +
               default.wait_for_unit("trilium-server.service")

     

       38
       38
       +
               default.succeed("test -f /var/lib/trilium/document.db")

     

       41
       39
        
       

     

       42
       42
       -
             with subtest("configured with custom data store"):

     

       43
       43
       -
                 configured.wait_for_unit("trilium-server.service")

     

       44
       44
       -
                 configured.succeed("test -f /data/trilium/document.db")

     

       40
       40
       +
           with subtest("configured with custom data store"):

     

       41
       41
       +
               configured.wait_for_unit("trilium-server.service")

     

       42
       42
       +
               configured.succeed("test -f /data/trilium/document.db")

     

       45
       43
        
       

     

       46
       46
       -
             with subtest("nginx with custom host name"):

     

       47
       47
       -
                 nginx.wait_for_unit("trilium-server.service")

     

       48
       48
       -
                 nginx.wait_for_unit("nginx.service")

     

       44
       44
       +
           with subtest("nginx with custom host name"):

     

       45
       45
       +
               nginx.wait_for_unit("trilium-server.service")

     

       46
       46
       +
               nginx.wait_for_unit("nginx.service")

     

       49
       47
        
       

     

       50
       50
       -
                 nginx.succeed(

     

       51
       51
       -
                     "curl --resolve 'trilium.example.com:80:127.0.0.1' http://trilium.example.com/"

     

       52
       52
       -
                 )

     

       53
       53
       -
           '';

     

       54
       54
       -
         }

     

       55
       55
       -
       )

     

       48
       48
       +
               nginx.succeed(

     

       49
       49
       +
                   "curl --resolve 'trilium.example.com:80:127.0.0.1' http://trilium.example.com/"

     

       50
       50
       +
               )

     

       51
       51
       +
         '';

     

       52
       52
       +
       }