summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtur Malabarba <bruce.connor.am@gmail.com>2015-04-01 16:00:09 +0100
committerArtur Malabarba <bruce.connor.am@gmail.com>2015-04-01 16:00:09 +0100
commitebe1f8916914b93af13b00ffd4bf15184121c76e (patch)
tree8c694c20f53506d249a9563014c4fc7f7642929d
parent76b1a1f4ebaff9cdc98002859ea03795501b2da8 (diff)
downloademacs-ebe1f8916914b93af13b00ffd4bf15184121c76e.tar.gz
* automated/package-test.el: Avoid async while testing.
-rw-r--r--test/ChangeLog4
-rw-r--r--test/automated/package-test.el2
2 files changed, 6 insertions, 0 deletions
diff --git a/test/ChangeLog b/test/ChangeLog
index 30b88412468..f722ce2be33 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-01 Artur Malabarba <bruce.connor.am@gmail.com>
+
+ * automated/package-test.el: Avoid async while testing.
+
2015-03-27 Wolfgang Jenkner <wjenkner@inode.at>
* automated/textprop-tests.el: New file.
diff --git a/test/automated/package-test.el b/test/automated/package-test.el
index 5da3c3689bf..5be928fbe80 100644
--- a/test/automated/package-test.el
+++ b/test/automated/package-test.el
@@ -36,6 +36,8 @@
(require 'ert)
(require 'cl-lib)
+(setq package-menu-async nil)
+
(defvar package-test-user-dir nil
"Directory to use for installing packages during testing.")