Commit 71134d2a authored by Laurent Bigonville's avatar Laurent Bigonville

Drop debian/patches: all patches merged upstream

parent 7548d0e3
From: Iain Lane <iainl@gnome.org>
Date: Wed, 10 Apr 2019 11:56:09 +0100
Subject: disk-small test: Use ErrorRegex and match any whitespace
GLib 3da40e90366820b1dd75769a67a3cbe2098334b7 (2.59.1) introduced the
use of non-breaking spaces between the size and units when using
g_format_size(). We were checking for a normal space only, so this test
started failing.
Use a regular expression and match any kind of whitespace there.
Forwarded: https://gitlab.gnome.org/World/deja-dup/merge_requests/22
Origin: https://gitlab.gnome.org/iainl/deja-dup/commit/92adf7ffc71e4bcd7f899799405b46a8805aa0f8
---
libdeja/tests/scripts/disk-small.test | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libdeja/tests/scripts/disk-small.test b/libdeja/tests/scripts/disk-small.test
index 028605b..6043111 100644
--- a/libdeja/tests/scripts/disk-small.test
+++ b/libdeja/tests/scripts/disk-small.test
@@ -4,7 +4,7 @@
[Operation]
Type=backup
Success=false
-Error=Backup location is too small. Try using one with at least 1000.0 TB.
+ErrorRegex=Backup location is too small\\. Try using one with at least 1000.0\\sTB\\.
[Duplicity]
Runs=status;dry;
test-runner-Ensure-outputscript-ends-with-n-n.patch
disk-small-test-Use-ErrorRegex-and-match-any-whitespace.patch
From: Iain Lane <iainl@gnome.org>
Date: Wed, 10 Apr 2019 11:32:12 +0100
Subject: test runner: Ensure outputscript ends with \n\n
Since glib ff8b731639893c35c42de027868ddd1931b2a8ba (2.59.0), GLib now
doesn't output an extraneous newline when parsing keyfile comments. In
the deja-dup testsuite we were making use of the fact that it did.
Strip any newlines off and then add them back ourselves, so that we work
with the old and new behaviour.
Forwarded: https://gitlab.gnome.org/World/deja-dup/merge_requests/22
Origin: https://gitlab.gnome.org/iainl/deja-dup/commit/60f784dbdf95d3d4bf42babd438b9db815719d92
---
libdeja/tests/runner.vala | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/libdeja/tests/runner.vala b/libdeja/tests/runner.vala
index f1c31d1..065b3d5 100644
--- a/libdeja/tests/runner.vala
+++ b/libdeja/tests/runner.vala
@@ -613,8 +613,11 @@ void process_duplicity_run_block(KeyFile keyfile, string run, BackupRunner br) t
else if (!encrypted) // when not encrypted, we always expect empty string
dupscript += "\n" + "PASSPHRASE:";
- if (outputscript != null && outputscript != "")
- dupscript += "\n\n" + outputscript + "\n";
+ if (outputscript != null && outputscript != "") {
+ // GLib prior to 2.59 added an extra \n to outputscript, but we need \n\n
+ // here, so we add them ourselves.
+ dupscript += "\n\n" + outputscript.chomp() + "\n\n";
+ }
add_to_mockscript(dupscript);
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment