* package-test.el (package-test-signed): More informative failure messages

Not that anyone appears to read them.

2 files changed, 15 insertions, 9 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index ff02bd6a25d..74fc7cebd56 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,15 +1,17 @@
+2015-02-10  Glenn Morris  <rgm@gnu.org>
+
+        * automated/package-test.el (package-test-signed):
+        More informative failure messages.
+
 2015-02-07  Fabián Ezequiel Gallina  <fgallina@gnu.org>
 
-        * automated/python-tests.el
-        (python-eldoc--get-symbol-at-point-1)
+        * automated/python-tests.el (python-eldoc--get-symbol-at-point-1)
         (python-eldoc--get-symbol-at-point-2)
         (python-eldoc--get-symbol-at-point-3)
         (python-eldoc--get-symbol-at-point-4): New tests.
 
-2015-02-07  Fabián Ezequiel Gallina  <fgallina@gnu.org>
-
-        * automated/python-tests.el
-        (python-tests-visible-string): New function.
+        * automated/python-tests.el (python-tests-visible-string):
+        New function.
         (python-parens-electric-indent-1)
         (python-triple-quote-pairing): Fix indentation, move require calls.
         (python-hideshow-hide-levels-1)
diff --git a/test/automated/package-test.el b/test/automated/package-test.el
index 7d2a343a077..5da3c3689bf 100644
--- a/test/automated/package-test.el
+++ b/test/automated/package-test.el
@@ -419,13 +419,17 @@ Must called from within a `tar-mode' buffer."
       ;; Check if the installed package status is updated.
       (let ((buf (package-list-packages)))
         (package-menu-refresh)
-        (should (re-search-forward "^\\s-+signed-good\\s-+1\\.0\\s-+installed"
-                                   nil t)))
+        (should (re-search-forward
+                 "^\\s-+signed-good\\s-+\\(\\S-+\\)\\s-+\\(\\S-+\\)\\s-"
+                 nil t))
+        (should (string-equal (match-string-no-properties 1) "1.0"))
+        (should (string-equal (match-string-no-properties 2) "installed")))
       ;; Check if the package description is updated.
       (with-fake-help-buffer
        (describe-package 'signed-good)
        (goto-char (point-min))
-       (should (search-forward "signed-good is an installed package." nil t))
+       (should (re-search-forward "signed-good is an? \\(\\S-+\\) package." nil t))
+       (should (string-equal (match-string-no-properties 1) "installed"))
        (should (search-forward
                 "Status: Installed in `~/signed-good-1.0/'."
                 nil t))))))