Merge branch 'master' into xwidget

2 files changed, 23 insertions, 5 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index d63a561953d..af36b5d2bde 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,13 +1,14 @@
+2015-01-20  Jorgen Schaefer  <contact@jorgenschaefer.de>
+
+        * automated/package-test.el (package-test-install-prioritized):
+        Re-add the test case and add priority to the correct repository
+        this time around.
+
 2015-01-21  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * automated/cl-generic-tests.el (setf cl--generic-2): Make sure
         the setf can be used already in the body of the method.
 
-2015-01-20  Jorgen Schaefer  <contact@jorgenschaefer.de>
-
-        * automated/package-test.el (package-test-install-prioritized):
-        Remove test due to unreproducable failures.
-
 2015-01-20  Michal Nazarewicz  <mina86@mina86.com>
 
         * automated/descr-text-test.el: New file with tests for
diff --git a/test/automated/package-test.el b/test/automated/package-test.el
index 27a71c528c6..3ea13dee4ad 100644
--- a/test/automated/package-test.el
+++ b/test/automated/package-test.el
@@ -230,6 +230,23 @@ Must called from within a `tar-mode' buffer."
     (package-refresh-contents)
     (package-install 'simple-single)))
 
+(ert-deftest package-test-install-prioritized ()
+  "Install a lower version from a higher-prioritized archive."
+  (with-package-test ()
+    (let* ((newer-version (expand-file-name "data/package/newer-versions"
+                                            package-test-file-dir))
+           (package-archives `(("older" . ,package-test-data-dir)
+                               ("newer" . ,newer-version)))
+           (package-archive-priorities '(("older" . 100))))
+
+      (package-initialize)
+      (package-refresh-contents)
+      (package-install 'simple-single)
+
+      (let ((installed (cadr (assq 'simple-single package-alist))))
+        (should (version-list-= '(1 3)
+                                (package-desc-version installed)))))))
+
 (ert-deftest package-test-install-multifile ()
   "Check properties of the installed multi-file package."
   (with-package-test (:basedir "data/package" :install '(multi-file))