Revert "test: add emacs test for hiding a message following an HTML part"

[notmuch] / test / emacs
diff --git a/test/emacs b/test/emacs

index 198c27b07c10abb2fbaf71b0bdb621745060480d..6e922debc432017cae43338999bbecf7d8009a1e 100755 (executable)
--- a/test/emacs
+++ b/test/emacs
@@ -412,33 +412,7 @@ test_emacs '(notmuch-search "id:\"bought\"")
          (yank)
             (test-output)'
  sed -i -e 's/^thread:.*$/thread:XXX/' OUTPUT
-test_expect_equal $(cat OUTPUT) "thread:XXX"
-
-test_begin_subtest 'Hiding message following HTML part'
-test_subtest_known_broken
-id='html-message@notmuchmail.org'
-emacs_deliver_message \
-    'HTML message' \
-    '' \
-    "(message-goto-eoh)
-     (insert \"Message-ID: <$id>\n\")
-     (message-goto-body)
-     (mml-insert-part \"text/html\")
-     (insert \"<body>This is a test HTML message</body>\")"
-emacs_deliver_message \
-    'Reply to HTML message' \
-    'This is a reply to the test HTML message' \
-    "(message-goto-eoh)
-     (insert \"In-Reply-To: <$id>\n\")"
-test_emacs "(notmuch-show \"id:$id\") \
-            (notmuch-show-next-message) \
-            (command-execute (key-binding (kbd \"RET\"))) \
-            (test-visible-output)"
-test_emacs "(notmuch-show \"id:$id\") \
-            (notmuch-show-next-message) \
-            (notmuch-show-toggle-message) \
-            (test-visible-output \"EXPECTED\")"
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal "$(cat OUTPUT)" "thread:XXX"
  
  test_begin_subtest 'notmuch-show-advance-and-archive with invisible signature'
  message1='id:20091118010116.GC25380@dottiness.seas.harvard.edu'
@@ -472,4 +446,34 @@ test_emacs '(notmuch-show "id:f35dbb950911171438k5df6eb56k77b6c0944e2e79ae@mail.
             (test-visible-output)'
  test_expect_equal_file OUTPUT EXPECTED
  
+test_begin_subtest "Do not call notmuch for non-inlinable application/mpeg parts"
+id='message-with-application/mpeg-attachment@notmuchmail.org'
+emacs_deliver_message \
+    'Message with application/mpeg attachment' \
+    '' \
+    "(message-goto-eoh)
+     (insert \"Message-ID: <$id>\n\")
+     (message-goto-body)
+     (mml-insert-part \"application/mpeg\")
+     (insert \"a fake mp3 file\")"
+notmuch_counter_reset
+test_emacs "(let ((notmuch-command \"$notmuch_counter_command\"))
+             (notmuch-show \"id:$id\"))"
+test_expect_equal $(notmuch_counter_value) 1
+
+test_begin_subtest "Do not call notmuch for non-inlinable audio/mpeg parts"
+id='message-with-audio/mpeg-attachment@notmuchmail.org'
+emacs_deliver_message \
+    'Message with audio/mpeg attachment' \
+    '' \
+    "(message-goto-eoh)
+     (insert \"Message-ID: <$id>\n\")
+     (message-goto-body)
+     (mml-insert-part \"audio/mpeg\")
+     (insert \"a fake mp3 file\")"
+notmuch_counter_reset
+test_emacs "(let ((notmuch-command \"$notmuch_counter_command\"))
+             (notmuch-show \"id:$id\"))"
+test_expect_equal $(notmuch_counter_value) 1
+
  test_done