[Emacs-diffs] emacs-24 r116835: Fix test failure in non-graphical mode

[Dmitry Gutov]

------------------------------------------------------------
revno: 116835
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Gutov <address@hidden>
branch nick: emacs-24
timestamp: Sun 2014-03-23 05:26:13 +0200
message:
  Fix test failure in non-graphical mode
  
  * test/automated/package-test.el (package-test-describe-package):
  Fix test failure in non-graphical mode.
  
  Add some missing ChangeLog entries.
modified:
  test/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-8588
  test/automated/package-test.el 
packagetest.el-20130627091655-6mb005jio30t2i3i-1

=== modified file 'test/ChangeLog'
--- a/test/ChangeLog    2014-03-07 14:11:37 +0000
+++ b/test/ChangeLog    2014-03-23 03:26:13 +0000
@@ -1,3 +1,26 @@
+2014-03-23  Dmitry Gutov  <address@hidden>
+
+       * automated/package-test.el (package-test-describe-package):
+       Fix test failure in non-graphical mode.
+
+2014-03-22  Dmitry Gutov  <address@hidden>
+
+       * 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  <address@hidden>
+
+       * 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-07  Michael Albinus  <address@hidden>
 
        * automated/tramp-tests.el (tramp-copy-size-limit): Declare.

=== modified file 'test/automated/package-test.el'
--- a/test/automated/package-test.el    2014-03-22 08:43:30 +0000
+++ b/test/automated/package-test.el    2014-03-23 03:26:13 +0000
@@ -326,7 +326,7 @@
      (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.