Enable all tests on Travis

1 files changed, 83 insertions, 88 deletions

diff --git a/test/lisp/use-package/use-package-tests.el b/test/lisp/use-package/use-package-tests.el
index 21890d7400f..1169de5147a 100644
--- a/test/lisp/use-package/use-package-tests.el
+++ b/test/lisp/use-package/use-package-tests.el
@@ -26,8 +26,6 @@
 (require 'ert)
 (require 'use-package)
 
-(defvar running-on-travis t)
-
 (setq use-package-always-ensure nil
       use-package-verbose 'errors
       use-package-expand-minimally t
@@ -824,11 +822,30 @@
         (autoload #'bar "foo" nil t))
       (bar))))
 
-(unless running-on-travis
-  (ert-deftest use-package-test/:commands-5 ()
+(ert-deftest use-package-test/:commands-5 ()
+  (match-expansion
+   (use-package gnus-harvest
+     :load-path "foo"
+     :commands gnus-harvest-install
+     :demand t
+     :config
+     (if (featurep 'message-x)
+         (gnus-harvest-install 'message-x)
+       (gnus-harvest-install)))
+   `(progn
+      (eval-and-compile
+        (add-to-list 'load-path ,(pred stringp)))
+      (require 'gnus-harvest nil nil)
+      (if (featurep 'message-x)
+          (gnus-harvest-install 'message-x)
+        (gnus-harvest-install))
+      t)))
+
+(ert-deftest use-package-test/:commands-6 ()
+  (let ((byte-compile-current-file t))
     (match-expansion
      (use-package gnus-harvest
-       :load-path "lisp/gnus-harvest"
+       :load-path "foo"
        :commands gnus-harvest-install
        :demand t
        :config
@@ -837,39 +854,19 @@
          (gnus-harvest-install)))
      `(progn
         (eval-and-compile
-          (add-to-list 'load-path "/Users/johnw/.emacs.d/lisp/gnus-harvest"))
+          (add-to-list 'load-path ,(pred stringp)))
+        (eval-and-compile
+          (eval-when-compile
+            (with-demoted-errors "Cannot load gnus-harvest: %S" nil
+                                 (load "gnus-harvest" nil t))))
+        (eval-when-compile
+          (declare-function gnus-harvest-install "gnus-harvest"))
         (require 'gnus-harvest nil nil)
-        (if (featurep 'message-x)
+        (if
+            (featurep 'message-x)
             (gnus-harvest-install 'message-x)
           (gnus-harvest-install))
-        t)))
-
-  (ert-deftest use-package-test/:commands-6 ()
-    (let ((byte-compile-current-file t))
-      (match-expansion
-       (use-package gnus-harvest
-         :load-path "lisp/gnus-harvest"
-         :commands gnus-harvest-install
-         :demand t
-         :config
-         (if (featurep 'message-x)
-             (gnus-harvest-install 'message-x)
-           (gnus-harvest-install)))
-       `(progn
-          (eval-and-compile
-            (add-to-list 'load-path "/Users/johnw/.emacs.d/lisp/gnus-harvest"))
-          (eval-and-compile
-            (eval-when-compile
-              (with-demoted-errors "Cannot load gnus-harvest: %S" nil
-                                   (load "gnus-harvest" nil t))))
-          (eval-when-compile
-            (declare-function gnus-harvest-install "gnus-harvest"))
-          (require 'gnus-harvest nil nil)
-          (if
-              (featurep 'message-x)
-              (gnus-harvest-install 'message-x)
-            (gnus-harvest-install))
-          t)))))
+        t))))
 
 (ert-deftest use-package-test/:defines-1 ()
   (match-expansion
@@ -1339,40 +1336,39 @@
         (eval-after-load 'bar
           '(require 'foo nil nil))))))
 
-(unless running-on-travis
-  (ert-deftest use-package-test/:demand-7 ()
-    (match-expansion
-     (use-package counsel
-       :load-path "site-lisp/swiper"
-       :after ivy
-       :demand t
-       :diminish
-       :bind (("C-*" . counsel-org-agenda-headlines)
-              ("M-x" . counsel-M-x))
-       :commands (counsel-minibuffer-history
-                  counsel-find-library
-                  counsel-unicode-char)
-       :preface (preface-code)
-       :init
-       ;; This is actually wrong, but it's just part of the example.
-       (define-key minibuffer-local-map (kbd "M-r")
-         'counsel-minibuffer-history))
-     `(progn
-        (eval-and-compile
-          (add-to-list 'load-path "/Users/johnw/.emacs.d/site-lisp/swiper"))
-        (eval-and-compile
-          (preface-code))
-        (eval-after-load 'ivy
-          '(progn
-             (define-key minibuffer-local-map (kbd "M-r")
-               'counsel-minibuffer-history)
-             (require 'counsel nil nil)
-             (if (fboundp 'diminish)
-                 (diminish 'counsel-mode))
-             (ignore
-              (bind-keys :package counsel
-                         ("C-*" . counsel-org-agenda-headlines)
-                         ("M-x" . counsel-M-x)))))))))
+(ert-deftest use-package-test/:demand-7 ()
+  (match-expansion
+   (use-package counsel
+     :load-path "foo"
+     :after ivy
+     :demand t
+     :diminish
+     :bind (("C-*" . counsel-org-agenda-headlines)
+            ("M-x" . counsel-M-x))
+     :commands (counsel-minibuffer-history
+                counsel-find-library
+                counsel-unicode-char)
+     :preface (preface-code)
+     :init
+     ;; This is actually wrong, but it's just part of the example.
+     (define-key minibuffer-local-map (kbd "M-r")
+       'counsel-minibuffer-history))
+   `(progn
+      (eval-and-compile
+        (add-to-list 'load-path ,(pred stringp)))
+      (eval-and-compile
+        (preface-code))
+      (eval-after-load 'ivy
+        '(progn
+           (define-key minibuffer-local-map (kbd "M-r")
+             'counsel-minibuffer-history)
+           (require 'counsel nil nil)
+           (if (fboundp 'diminish)
+               (diminish 'counsel-mode))
+           (ignore
+            (bind-keys :package counsel
+                       ("C-*" . counsel-org-agenda-headlines)
+                       ("M-x" . counsel-M-x))))))))
 
 (ert-deftest use-package-test/:config-1 ()
   (match-expansion
@@ -1667,26 +1663,25 @@
                ("C-c C-r" . org-ref-helm-insert-cite-link))
    `(bind-key "C-c C-r" #'org-ref-helm-insert-cite-link override-global-map nil)))
 
-(unless running-on-travis
-  (ert-deftest use-package-test/560 ()
-    (flet ((executable-find (name)))
-      (let (notmuch-command)
-        (match-expansion
-         (use-package notmuch
-           :preface (setq-default notmuch-command (executable-find "notmuch"))
-           :if notmuch-command
-           :requires foo
-           :load-path "my-load-path"
-           :defines var)
-         `(progn
+(ert-deftest use-package-test/560 ()
+  (flet ((executable-find (name)))
+    (let (notmuch-command)
+      (match-expansion
+       (use-package notmuch
+         :preface (setq-default notmuch-command (executable-find "notmuch"))
+         :if notmuch-command
+         :requires foo
+         :load-path "foo"
+         :defines var)
+       `(progn
+          (eval-and-compile
+            (add-to-list 'load-path ,(pred stringp)))
+          (when (featurep 'foo)
             (eval-and-compile
-              (add-to-list 'load-path "/Users/johnw/.emacs.d/my-load-path"))
-            (when (featurep 'foo)
-              (eval-and-compile
-                (setq-default notmuch-command
-                              (executable-find "notmuch")))
-              (when (symbol-value 'notmuch-command)
-                (require 'notmuch nil nil)))))))))
+              (setq-default notmuch-command
+                            (executable-find "notmuch")))
+            (when (symbol-value 'notmuch-command)
+              (require 'notmuch nil nil))))))))
 
 (ert-deftest bind-key/:prefix-map ()
   (match-expansion