summaryrefslogtreecommitdiffstats
path: root/debian/patches/0003-test_set_expire-increase-short-expiry-time-from-10s-.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/0003-test_set_expire-increase-short-expiry-time-from-10s-.patch')
-rw-r--r--debian/patches/0003-test_set_expire-increase-short-expiry-time-from-10s-.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/debian/patches/0003-test_set_expire-increase-short-expiry-time-from-10s-.patch b/debian/patches/0003-test_set_expire-increase-short-expiry-time-from-10s-.patch
new file mode 100644
index 0000000..35ba2f4
--- /dev/null
+++ b/debian/patches/0003-test_set_expire-increase-short-expiry-time-from-10s-.patch
@@ -0,0 +1,33 @@
+From: Andreas Stieger <Andreas.Stieger@gmx.de>
+Date: Mon, 19 Jun 2023 23:21:43 +0200
+Subject: test_set_expire: increase short expiry time from 10s to 60s
+
+Fixes #2100, #2059
+
+(cherry picked from commit 3be41e061e28ffe0bc368b6cce57c4e07a6d1983)
+---
+ src/tests/cli_tests.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/tests/cli_tests.py b/src/tests/cli_tests.py
+index e6f5ed7..f0bcc75 100755
+--- a/src/tests/cli_tests.py
++++ b/src/tests/cli_tests.py
+@@ -1997,14 +1997,14 @@ class Keystore(unittest.TestCase):
+ matches = re.findall(r'(key expiration time: 63072000 seconds \(730 days\))', out)
+ self.assertEqual(len(matches), 1)
+
+- # Expires in 10 seconds
+- ret, out, _ = run_proc(RNPK, ['--homedir', RNPDIR, '--edit-key', '--set-expire', '10', 'primary_with_empty_password@rnp'])
++ # Expires in 60 seconds
++ ret, out, _ = run_proc(RNPK, ['--homedir', RNPDIR, '--edit-key', '--set-expire', '60', 'primary_with_empty_password@rnp'])
+ self.assertEqual(ret, 0)
+ self.assertRegex(out, r'(?s)^.*\[EXPIRES .*')
+
+ ret, out, _ = run_proc(RNP, ['--list-packets', kpath])
+ self.assertEqual(ret, 0)
+- self.assertRegex(out, r'(?s)^.*key expiration time: 10 seconds \(0 days\).*')
++ self.assertRegex(out, r'(?s)^.*key expiration time: 60 seconds \(0 days\).*')
+
+ # Expires in 10 hours
+ ret, out, _ = run_proc(RNPK, ['--homedir', RNPDIR, '--edit-key', '--set-expire', '10h', 'primary_with_empty_password@rnp'])