writer: check that parsed messages can be reformatted verbatim#187
Merged
emersion merged 1 commit intoemersion:masterfrom Jan 13, 2025
Merged
writer: check that parsed messages can be reformatted verbatim#187emersion merged 1 commit intoemersion:masterfrom
emersion merged 1 commit intoemersion:masterfrom
Conversation
emersion
reviewed
Jan 13, 2025
Owner
emersion
left a comment
emersion
left a comment
There was a problem hiding this comment.
Could the original message be reduced to the minimum reproducer?
Comment on lines
+218
to
+231
| orig, _ := os.CreateTemp(os.TempDir(), "go-message-orig-*.txt") | ||
| after, _ := os.CreateTemp(os.TempDir(), "go-message-after-*.txt") | ||
| defer os.Remove(orig.Name()) | ||
| defer os.Remove(after.Name()) | ||
| orig.WriteString(original) | ||
| orig.Close() | ||
| after.Write(buf.Bytes()) | ||
| after.Close() | ||
|
|
||
| var stdout bytes.Buffer | ||
| cmd := exec.Command("diff", "-u", orig.Name(), after.Name()) | ||
| cmd.Stdout = &stdout | ||
| cmd.Run() | ||
| t.Fatalf("reformatted message differs:\n%s", stdout.String()) |
Owner
There was a problem hiding this comment.
Hm, not a fan of shelling out to diff. Even if that makes reading the difference more difficult, can we just print both strings instead?
Contributor
Author
There was a problem hiding this comment.
yes, it was to make spotting the differences easier, but I guess you can instrument the test later to debug it more.
Contributor
Author
The message needs to be sufficiently long to trigger the issue. I'll try to scrape off the excess as much as possible. |
Owner
|
Probably at least the header could be shortened quite a bit? |
rjarry
force-pushed
the
rewrite-verbatim
branch
from
fa00e15 to
2cfbf4b
Compare
Without the recent change of line wrapper implementation, this test is
failing. There seem to be line breaks inserted in the middle of the
body:
```diff
--- /tmp/go-message-orig-194495186.txt
+++ /tmp/go-message-after-83245617.txt
@@ -37,7 +37,8 @@
if c.editor == nil {
return
}
-@@ -1205,7 +1213,7 @@ func (c *Composer) termClosed(err error) {
+@@ -1205,7 +1
+213,7 @@ func (c *Composer) termClosed(err error) {
PushError("Failed to reopen email file: " + e.Error())
}
editor := c.editor
@@ -70,7 +71,8 @@
+ PushError(err.Error())
+ })
}
- return
+ return
+
}
--
2.47.1
```
Link: emersion@c2ff70fd20da09d40ba
Link: emersion@6a718fa6214f9f35d33
Signed-off-by: Robin Jarry <robin@jarry.cc>
Contributor
Author
|
Ooops, forgot to remove the reverts to check that the test was indeed failing: |
rjarry
force-pushed
the
rewrite-verbatim
branch
from
2cfbf4b to
c1b1b45
Compare
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Without the recent change of line wrapper implementation, this test is failing with the following error:
Link: c2ff70fd20da09d40ba
Link: 6a718fa6214f9f35d33