[pim/kdepim-addons] plugins/messageviewer/bodypartformatter/autotests: Fix timeout in rendertest and adjust the remaining test data
Volker Krause <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit 31a27ae25716e2eac81cdaa459d99decd517271e by Volker Krause.
Committed on 17/08/2026 at 15:33.
Pushed by vkrause into branch 'master'.
Fix timeout in rendertest and adjust the remaining test data
M +2 -14 plugins/messageviewer/bodypartformatter/autotests/data/message-with-openpgp-key.mbox.html.details
M +2 -2 plugins/messageviewer/bodypartformatter/autotests/data/message-with-two-openpgp-key.mbox.html.details
M +2 -2 plugins/messageviewer/bodypartformatter/autotests/data/message-with-two-openpgp-key.mbox.html.running
M +0 -3 plugins/messageviewer/bodypartformatter/autotests/rendertest.cpp
https://invent.kde.org/pim/kdepim-addons/-/commit/31a27ae25716e2eac81cdaa459d99decd517271e
diff --git a/plugins/messageviewer/bodypartformatter/autotests/data/message-with-openpgp-key.mbox.html.details b/plugins/messageviewer/bodypartformatter/autotests/data/message-with-openpgp-key.mbox.html.details
index 67e815906..e21acd026 100644
--- a/plugins/messageviewer/bodypartformatter/autotests/data/message-with-openpgp-key.mbox.html.details
+++ b/plugins/messageviewer/bodypartformatter/autotests/data/message-with-openpgp-key.mbox.html.details
@@ -7,19 +7,7 @@
<div id="attachmentDiv">
<table cellspacing="1" cellpadding="1" class="signWarn">
<tr class="signWarnH">
- <td dir="ltr">
- <table cellspacing="0" cellpadding="0" width="100%">
- <tr>
- <td rowspan="2">Message was signed on 5/19/17 3:20 PM with unknown key <a href="kmail:showCertificate#gpg ### OpenPGP ### 10F5C047999C3545">0x10F5C047999C3545</a>.<br/>The validity of the signature cannot be verified.<br/>Status:<i>No public key to verify the signature</i></td>
- <td align="right" valign="top" nowrap="nowrap">
- <a href="kmail:hideSignatureDetails">Hide Details</a>
- </td>
- </tr>
- <tr>
- <td align="right" valign="bottom" nowrap="nowrap"/>
- </tr>
- </table>
- </td>
+ <td dir="ltr">Signature created on 5/19/17 3:20 PM using an unknown certificate with fingerprint <br/><a href="certificate:96EC9E728272B158054B6A3110F5C047999C3545">96EC 9E72 8272 B158 054B 6A31 10F5 C047 999C 3545</a><br/>You can search the certificate on a keyserver or import it from a file.</td>
</tr>
<tr class="signWarnB">
<td>
@@ -47,7 +35,7 @@ table .keyB {
</tr>
<tr class="keyb">
<td>
[suppressed due to size limit]
[suppressed due to size limit]
</td>
</tr>
<tr class="keyH">
diff --git a/plugins/messageviewer/bodypartformatter/autotests/data/message-with-two-openpgp-key.mbox.html.details b/plugins/messageviewer/bodypartformatter/autotests/data/message-with-two-openpgp-key.mbox.html.details
index a8497142a..a2451d7c6 100644
--- a/plugins/messageviewer/bodypartformatter/autotests/data/message-with-two-openpgp-key.mbox.html.details
+++ b/plugins/messageviewer/bodypartformatter/autotests/data/message-with-two-openpgp-key.mbox.html.details
@@ -29,7 +29,7 @@ table .keyB {
</tr>
<tr class="keyb">
<td>
[suppressed due to size limit]
[suppressed due to size limit]
</td>
</tr>
<tr class="keyH">
@@ -52,7 +52,7 @@ table .keyB {
</tr>
<tr class="keyb">
<td>
- <div style="padding: 10pt;"><p>This is an OpenPGP key, which can be used to sign or encrypt emails.</p><p class="error">Error while loading key: No valid key data in file.</p><a href="kmail:hideSignatureDetails">Hide key details</a>| <a href="x-kmail:/bodypart/0/3/pgpkey?action=import">Import key</a></div>
+ <div style="padding: 10pt;"><p>This is an OpenPGP key, which can be used to sign or encrypt emails.</p><p class="error">Error while loading key: No valid key data in file.</p><a href="kmail:hideSignatureDetails">Hide key details</a>| <a href="x-kmail:/bodypart/0/attachment:3/pgpkey?action=import">Import key</a></div>
</td>
</tr>
<tr class="keyH">
diff --git a/plugins/messageviewer/bodypartformatter/autotests/data/message-with-two-openpgp-key.mbox.html.running b/plugins/messageviewer/bodypartformatter/autotests/data/message-with-two-openpgp-key.mbox.html.running
index e97975b25..a2451d7c6 100644
--- a/plugins/messageviewer/bodypartformatter/autotests/data/message-with-two-openpgp-key.mbox.html.running
+++ b/plugins/messageviewer/bodypartformatter/autotests/data/message-with-two-openpgp-key.mbox.html.running
@@ -29,7 +29,7 @@ table .keyB {
</tr>
<tr class="keyb">
<td>
[suppressed due to size limit]
[suppressed due to size limit]
</td>
</tr>
<tr class="keyH">
@@ -52,7 +52,7 @@ table .keyB {
</tr>
<tr class="keyb">
<td>
- <div style="padding: 10pt;"><p>This is an OpenPGP key, which can be used to sign or encrypt emails.</p><p class="error">Error while loading key: No valid key data in file.</p><a href="kmail:hideSignatureDetails">Hide key details</a>| <a href="x-kmail:/bodypart/0/3/pgpkey?action=import">Import key</a></div>
+ <div style="padding: 10pt;"><p>This is an OpenPGP key, which can be used to sign or encrypt emails.</p><p class="error">Error while loading key: No valid key data in file.</p><a href="kmail:hideSignatureDetails">Hide key details</a>| <a href="x-kmail:/bodypart/0/attachment:3/pgpkey?action=import">Import key</a></div>
</td>
</tr>
<tr class="keyH">
diff --git a/plugins/messageviewer/bodypartformatter/autotests/rendertest.cpp b/plugins/messageviewer/bodypartformatter/autotests/rendertest.cpp
index ce38cea49..31752983d 100644
--- a/plugins/messageviewer/bodypartformatter/autotests/rendertest.cpp
+++ b/plugins/messageviewer/bodypartformatter/autotests/rendertest.cpp
@@ -128,7 +128,6 @@ void RenderTest::testRenderKeyDetails()
msg->parse();
// render the mail
- QEventLoop loop;
MessageViewer::FileHtmlWriter fileWriter(outFileName);
QImage paintDevice;
MessageViewer::CSSHelperBase cssHelper(&paintDevice);
@@ -137,7 +136,6 @@ void RenderTest::testRenderKeyDetails()
testSource.setShowSignatureDetails(true);
MimeTreeParser::ObjectTreeParser otp(&testSource, &nodeHelper);
- connect(&nodeHelper, &MimeTreeParser::NodeHelper::update, &loop, &QEventLoop::quit);
otp.parseObjectTree(msg.get());
fileWriter.begin();
@@ -150,7 +148,6 @@ void RenderTest::testRenderKeyDetails()
fileWriter.end();
compareFile(outFileName, referenceFileName + QStringLiteral(".running"));
- loop.exec();
{
MimeTreeParser::ObjectTreeParser otp(&testSource, &nodeHelper);