1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
|
From e8fe4c3f2c8f3c0a3159f4e56a5dfbcc8d4f5fcd Mon Sep 17 00:00:00 2001
From: Simon Chopin <simon.chopin@canonical.com>
Date: Mon, 24 Oct 2022 16:27:59 +0200
Subject: [PATCH] tests/server-test: fix the tests on usr-merged systems
The testsuite is failing on Ubuntu builders as they operate with /bin a
symlink to /usr/bin. As a result, depending on how you resolve it, `ls`
can either be `/bin/ls` or `/usr/bin/ls`. Since Debian also seems to
transition to such a setup, it might be wise to simply relax the tests.
---
tests/server-test.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Forwarded: yes, https://github.com/ArcticaProject/remote-logon-service/pull/4
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/remote-logon-service/+bug/1994041
diff --git a/tests/server-test.c b/tests/server-test.c
index 9b55246..d339499 100644
--- a/tests/server-test.c
+++ b/tests/server-test.c
@@ -107,7 +107,8 @@ test_uccs_exec (void)
g_assert(server != NULL);
g_assert(g_strcmp0(server->name, "My Server") == 0);
g_assert(g_strcmp0(server->uri, "http://my.domain.com") == 0);
- g_assert(g_strcmp0(UCCS_SERVER(server)->exec, "/bin/ls") == 0);
+ g_assert(g_strcmp0(UCCS_SERVER(server)->exec, "/bin/ls") == 0 ||
+ g_strcmp0(UCCS_SERVER(server)->exec, "/usr/bin/ls") == 0);
g_object_unref(server);
g_key_file_unref(keyfile);
--
2.37.2
|
