From 48b35672d6a1475b1506650c7d04d4a90e1ad49a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Sat, 16 Dec 2023 14:39:48 +0100
Subject: [PATCH] software/nextcloud/test: adjust test

In 9636d79ca (Nextcloud Upgrade fixes, 2023-12-13) parameter changed:
 - instance.trusted-domain-* parameters are replaced by instance.trusted-domain-list
 - the frontend is part of trusted domain, so with "bypassed" frontends
from slapos proxy the backend appears twice (because the backend URL is
returned as frontend URL)
---
 software/nextcloud/test/test.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/software/nextcloud/test/test.py b/software/nextcloud/test/test.py
index 23a3d6ffc..5b254d7d9 100644
--- a/software/nextcloud/test/test.py
+++ b/software/nextcloud/test/test.py
@@ -92,7 +92,7 @@ class NextCloudTestCase(InstanceTestCase):
       mail_smtpname="",
       cli_url="https://[%s]:9988/" % self.nextcloud_ipv6,
       partition_dir=self.partition_dir,
-      trusted_domain_list=json.dumps(["[%s]:9988" % self.nextcloud_ipv6]),
+      trusted_domain_list=json.dumps(["[%s]:9988" % self.nextcloud_ipv6] * 2),
       trusted_proxy_list=[],
     )
     data_dict.update(config_dict)
@@ -309,8 +309,7 @@ class TestNextCloudParameters(NextCloudTestCase):
       'instance.turn-server': 'turn.example.net:5439',
       'instance.turn-secret': 'c4f0ead40a49bbbac3c58f7b9b43990f78ebd96900757ae67e10190a3a6b6053',
       'instance.cli-url': 'nextcloud.example.com',
-      'instance.trusted-domain-1': 'nextcloud.example.com',
-      'instance.trusted-domain-2': 'nextcloud.proxy.com',
+      'instance.trusted-domain-list': 'nextcloud.example.com nextcloud.proxy.com',
       'instance.trusted-proxy-list': '2001:67c:1254:e:89::5df3 127.0.0.1 10.23.1.3',
     }
 
@@ -345,6 +344,7 @@ class TestNextCloudParameters(NextCloudTestCase):
       cli_url="nextcloud.example.com",
       partition_dir=self.partition_dir,
       trusted_domain_list=json.dumps([
+        "[%s]:9988" % self.nextcloud_ipv6,
         "[%s]:9988" % self.nextcloud_ipv6,
         "nextcloud.example.com",
         "nextcloud.proxy.com"
-- 
2.30.9