Merge from emacs-24; up to 2014-03-21T23:16:26Z!rms@gnu.org

2 files changed, 29 insertions, 1 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index 183fb409f1f..1fe024a1286 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -3,6 +3,34 @@
         * automated/cl-lib.el (cl-lib-keyword-names-versus-values): New
         test: correct parsing of keyword arguments.
 
+2014-03-23  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * automated/package-test.el (package-test-describe-package):
+        Fix test failure in non-graphical mode.
+
+2014-03-22  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * automated/package-test.el (package-test-describe-package):
+        Check for the "Keywords: " line.
+
+        * automated/data/package/archive-contents: Include the :keywords
+        field in `simple-single' data form.
+
+2014-03-21  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * automated/package-test.el
+        (package-test-install-two-dependencies): New test (bug#16826).
+
+        * automated/data/package/simple-two-depend-1.1.el: New file.
+
+        * automated/data/package/archive-contents:
+        Add info about the new package.
+
+2014-03-23  Daniel Colascione  <dancol@dancol.org>
+
+        * automated/cl-lib.el (cl-lib-keyword-names-versus-values): New
+        test: correct parsing of keyword arguments.
+
 2014-03-07  Michael Albinus  <michael.albinus@gmx.de>
 
         * automated/tramp-tests.el (tramp-copy-size-limit): Declare.
diff --git a/test/automated/package-test.el b/test/automated/package-test.el
index 6d0dcdab299..ee1920b5ef4 100644
--- a/test/automated/package-test.el
+++ b/test/automated/package-test.el
@@ -326,7 +326,7 @@ Must called from within a `tar-mode' buffer."
      (should (search-forward "Summary: A single-file package with no dependencies"
                              nil t))
      (should (search-forward "Homepage: http://doodles.au" nil t))
-     (should (search-forward "Keywords: frobnicate"))
+     (should (re-search-forward "Keywords: \\[?frobnicate\\]?" nil t))
      ;; No description, though. Because at this point we don't know
      ;; what archive the package originated from, and we don't have
      ;; its readme file saved.