Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
[telepathy-gabble] Fix running some tests. Contributes to JB#42708
All of these were failing on readlink parameter busybox doesn't support. Changed that. For rest the python3 port seems halfway there, failing a lot on bytes vs strings typing. Fixed some of those, not sure would it be worth the effort in handling all if we don't really do telepathy-gabble development. Now 132 out of 245 pass which is already quite a lot better.
- Loading branch information
Showing
8 changed files
with
77 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
rpm/0002-Change-default-keepalive-interval-to-2.5-minutes.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
rpm/0003-switch-to-using-gireactor-to-work-with-new-gi-based-.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
rpm/0004-xmpp-console-Explicitly-state-python-in-the-shebang.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
From ba755ff4768b3f38d0c174984782b6cf0bf06873 Mon Sep 17 00:00:00 2001 | ||
From: Pekka Vuorela <pekka.vuorela@jolla.com> | ||
Date: Mon, 22 Mar 2021 16:00:21 +0200 | ||
Subject: [PATCH 7/7] Switch readlink parameter from -e to -f | ||
|
||
Should be good enough here and works with the busybox tool. | ||
--- | ||
tests/twisted/run-test.sh.in | 4 ++-- | ||
1 file changed, 2 insertions(+), 2 deletions(-) | ||
|
||
diff --git a/tests/twisted/run-test.sh.in b/tests/twisted/run-test.sh.in | ||
index 8dd5fd660..99f3f3358 100644 | ||
--- a/tests/twisted/run-test.sh.in | ||
+++ b/tests/twisted/run-test.sh.in | ||
@@ -1,8 +1,8 @@ | ||
#!/bin/sh | ||
|
||
if test "x$GABBLE_TEST_UNINSTALLED" = x; then | ||
- script_fullname=`readlink -e "@gabbletestsdir@/twisted/run-test.sh"` | ||
- if [ `readlink -e "$0"` != "$script_fullname" ] ; then | ||
+ script_fullname=`readlink -f "@gabbletestsdir@/twisted/run-test.sh"` | ||
+ if [ `readlink -f "$0"` != "$script_fullname" ] ; then | ||
echo "This script is meant to be installed at $script_fullname" >&2 | ||
exit 1 | ||
fi | ||
-- | ||
2.30.2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters