[PATCH 1/2] emacs: Add tests for quoting of MML tags in replies

2012-01-28 Thread Aaron Ecay
The test is broken at this time; the next commit will introduce a fix.
---

Thanks for the reminder, Austin.  Things got hectic, and it took a
little bludgeoning to get the test suite to behave.  I *think* I got
it, although I am by no means confident.  Specifically, I am seeing
some unrelated(?) test failures in the emacs suite, so I'd appreciate
it if someone with a well-functioning test suite tried out these
patches before they are pushed, to be sure I didn't break anything.

I tried to follow the "first patch introduces a failing test, second
patch fixes it" convention.

 test/emacs   |   14 ++
 test/emacs.expected-output/quote-mml |9 +
 2 files changed, 23 insertions(+), 0 deletions(-)
 create mode 100644 test/emacs.expected-output/quote-mml

diff --git a/test/emacs b/test/emacs
index 8ca4c8a..a57513a 100755
--- a/test/emacs
+++ b/test/emacs
@@ -273,6 +273,20 @@ On 01 Jan 2000 12:00:00 -, Notmuch Test Suite 
 w
 EOF
 test_expect_equal_file OUTPUT EXPECTED
 
+test_begin_subtest "Quote MML tags on reply"
+test_subtest_known_broken
+add_message '[from]="1337 h4xor "' \
+'[to]="Unsuspecting rube "' \
+'[subject]="hackety hack hack"' \
+'[body]="<#part type="application/octet-stream" filename="foo" 
disposition=attachment>
+<#/part>"' \
+'[id]="test-mml-quot...@msg.id"'
+test_emacs "(notmuch-show \"id:test-mml-quot...@msg.id\")
+(notmuch-show-reply-sender)
+(test-output)"
+test_expect_equal_file OUTPUT "$EXPECTED/quote-mml"
+
+
 test_begin_subtest "Save attachment from within emacs using 
notmuch-show-save-attachments"
 # save as archive to test that Emacs does not re-compress .gz
 test_emacs '(let ((standard-input "\"attachment1.gz\""))
diff --git a/test/emacs.expected-output/quote-mml 
b/test/emacs.expected-output/quote-mml
new file mode 100644
index 000..01bd2ca
--- /dev/null
+++ b/test/emacs.expected-output/quote-mml
@@ -0,0 +1,9 @@
+From: Notmuch Test Suite 
+To: 1337 h4xor 
+Subject: Re: hackety hack hack
+In-Reply-To: 
+Fcc: /home/aecay/development/notmuch/test/tmp.emacs/mail/sent
+--text follows this line--
+On Fri, 05 Jan 2001 15:43:57 +, 1337 h4xor  wrote:
+> <#!part type=application/octet-stream filename=foo disposition=attachment>
+> <#!/part>
-- 
1.7.9

___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch


[PATCH 1/2] emacs: Add tests for quoting of MML tags in replies

2012-01-29 Thread Aaron Ecay
The test is broken at this time; the next commit will introduce a fix.
---

Thanks for the reminder, Austin.  Things got hectic, and it took a
little bludgeoning to get the test suite to behave.  I *think* I got
it, although I am by no means confident.  Specifically, I am seeing
some unrelated(?) test failures in the emacs suite, so I'd appreciate
it if someone with a well-functioning test suite tried out these
patches before they are pushed, to be sure I didn't break anything.

I tried to follow the "first patch introduces a failing test, second
patch fixes it" convention.

 test/emacs   |   14 ++
 test/emacs.expected-output/quote-mml |9 +
 2 files changed, 23 insertions(+), 0 deletions(-)
 create mode 100644 test/emacs.expected-output/quote-mml

diff --git a/test/emacs b/test/emacs
index 8ca4c8a..a57513a 100755
--- a/test/emacs
+++ b/test/emacs
@@ -273,6 +273,20 @@ On 01 Jan 2000 12:00:00 -, Notmuch Test Suite 
 w
 EOF
 test_expect_equal_file OUTPUT EXPECTED

+test_begin_subtest "Quote MML tags on reply"
+test_subtest_known_broken
+add_message '[from]="1337 h4xor "' \
+'[to]="Unsuspecting rube "' \
+'[subject]="hackety hack hack"' \
+'[body]="<#part type="application/octet-stream" filename="foo" 
disposition=attachment>
+<#/part>"' \
+'[id]="test-mml-quoting at msg.id"'
+test_emacs "(notmuch-show \"id:test-mml-quoting at msg.id\")
+(notmuch-show-reply-sender)
+(test-output)"
+test_expect_equal_file OUTPUT "$EXPECTED/quote-mml"
+
+
 test_begin_subtest "Save attachment from within emacs using 
notmuch-show-save-attachments"
 # save as archive to test that Emacs does not re-compress .gz
 test_emacs '(let ((standard-input "\"attachment1.gz\""))
diff --git a/test/emacs.expected-output/quote-mml 
b/test/emacs.expected-output/quote-mml
new file mode 100644
index 000..01bd2ca
--- /dev/null
+++ b/test/emacs.expected-output/quote-mml
@@ -0,0 +1,9 @@
+From: Notmuch Test Suite 
+To: 1337 h4xor 
+Subject: Re: hackety hack hack
+In-Reply-To: 
+Fcc: /home/aecay/development/notmuch/test/tmp.emacs/mail/sent
+--text follows this line--
+On Fri, 05 Jan 2001 15:43:57 +, 1337 h4xor  wrote:
+> <#!part type=application/octet-stream filename=foo disposition=attachment>
+> <#!/part>
-- 
1.7.9



[PATCH 1/2] emacs: Add tests for quoting of MML tags in replies

2012-01-30 Thread David Bremner
On Sun, 29 Jan 2012 01:07:07 -0500, Aaron Ecay  wrote:
> The test is broken at this time; the next commit will introduce a fix.
> ---

Hi Aaron.

Applied to master test fails for me as follows (after the second patch
is applied as well).

 In-Reply-To: 
-Fcc: /home/aecay/development/notmuch/test/tmp.emacs/mail/sent
+Fcc: /home/bremner/software/upstream/notmuch/test/tmp.emacs/mail/sent

I guess it should force Fcc somehow in the test; didn't have time to dig
further.

Do you mind making another round, against the release branch this time
and taking the commit message comments into account?

d


Re: [PATCH 1/2] emacs: Add tests for quoting of MML tags in replies

2012-01-30 Thread David Bremner
On Sun, 29 Jan 2012 01:07:07 -0500, Aaron Ecay  wrote:
> The test is broken at this time; the next commit will introduce a fix.
> ---

Hi Aaron.

Applied to master test fails for me as follows (after the second patch
is applied as well).

 In-Reply-To: 
-Fcc: /home/aecay/development/notmuch/test/tmp.emacs/mail/sent
+Fcc: /home/bremner/software/upstream/notmuch/test/tmp.emacs/mail/sent

I guess it should force Fcc somehow in the test; didn't have time to dig
further.

Do you mind making another round, against the release branch this time
and taking the commit message comments into account?

d
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch