* update test, docs for mu extract

antono · Feb 13, 2012 · 7e9879c · 7e9879c
1 parent 0d08ff9
commit 7e9879c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/man/mu-extract.1 b/man/mu-extract.1
@@ -1,4 +1,4 @@
-.TH MU EXTRACT 1 "January 2012" "User Manuals"
+.TH MU EXTRACT 1 "February 2012" "User Manuals"
 
 .SH NAME
 
@@ -26,8 +26,9 @@ argument, all attachments with filenames matching that pattern will be
 extracted. The regular expressions are Perl-compatible (as per the
 PCRE-library).
 
-Without any options, \fBmu extract\fR simply outputs the list of MIME-parts in
-the message.
+Without any options, \fBmu extract\fR simply outputs the list of leaf
+MIME-parts in the message. Only 'leaf' MIME-parts (including RFC822
+attachments) are considered, \fBmultipart/*\fR etc. are ignored.
 
 .SH OPTIONS
 

diff --git a/src/tests/test-mu-cmd.c b/src/tests/test-mu-cmd.c
@@ -292,10 +292,9 @@ test_mu_extract_01 (void)
 	g_assert_cmpstr (output,
 			 ==,
 			 "MIME-parts in this message:\n"
-			 "  0 <none> multipart/mixed [<none>]\n"
-			 "  1 <none> text/plain [<none>] (0.0 kB)\n"
-			 "  2 sittingbull.jpg image/jpeg [inline] (23.9 kB)\n"
-			 "  3 custer.jpg image/jpeg [inline] (21.6 kB)\n");
+			 "  0 <none> text/plain [<none>] (0.0 kB)\n"
+			 "  1 sittingbull.jpg image/jpeg [inline] (23.9 kB)\n"
+			 "  2 custer.jpg image/jpeg [inline] (21.6 kB)\n");
 
 	/* we expect zero lines of error output */
 	g_assert_cmpuint (newlines_in_output(erroutput),==,0);
@@ -368,7 +367,7 @@ test_mu_extract_03 (void)
 
 	g_assert (g_mkdir_with_parents (tmpdir, 0700) == 0);
 
-	cmdline = g_strdup_printf ("%s extract --muhome=%s --parts 3 "
+	cmdline = g_strdup_printf ("%s extract --muhome=%s --parts 2 "
 				   "--target-dir=%s %s%cFoo%ccur%cmail5",
 				   MU_PROGRAM,
 				   tmpdir,