Enable all tests on Travis

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,10 @@
         (autoload #'bar "foo" nil t))
       (bar))))
 
-(unless running-on-travis
 (ert-deftest use-package-test/:commands-5 ()
   (match-expansion
    (use-package gnus-harvest
-       :load-path "lisp/gnus-harvest"
+     :load-path "foo"
      :commands gnus-harvest-install
      :demand t
      :config
@@ -837,7 +834,7 @@
        (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)))
       (require 'gnus-harvest nil nil)
       (if (featurep 'message-x)
           (gnus-harvest-install 'message-x)
@@ -848,7 +845,7 @@
   (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
@@ -857,7 +854,7 @@
          (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
@@ -869,7 +866,7 @@
             (featurep 'message-x)
             (gnus-harvest-install 'message-x)
           (gnus-harvest-install))
-          t)))))
+        t))))
 
 (ert-deftest use-package-test/:defines-1 ()
   (match-expansion
@@ -1339,11 +1336,10 @@
         (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"
+     :load-path "foo"
      :after ivy
      :demand t
      :diminish
@@ -1359,7 +1355,7 @@
        'counsel-minibuffer-history))
    `(progn
       (eval-and-compile
-          (add-to-list 'load-path "/Users/johnw/.emacs.d/site-lisp/swiper"))
+        (add-to-list 'load-path ,(pred stringp)))
       (eval-and-compile
         (preface-code))
       (eval-after-load 'ivy
@@ -1372,7 +1368,7 @@
            (ignore
             (bind-keys :package counsel
                        ("C-*" . counsel-org-agenda-headlines)
-                         ("M-x" . counsel-M-x)))))))))
+                       ("M-x" . counsel-M-x))))))))
 
 (ert-deftest use-package-test/:config-1 ()
   (match-expansion
@@ -1667,7 +1663,6 @@
                ("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)
@@ -1676,17 +1671,17 @@
          :preface (setq-default notmuch-command (executable-find "notmuch"))
          :if notmuch-command
          :requires foo
-           :load-path "my-load-path"
+         :load-path "foo"
          :defines var)
        `(progn
           (eval-and-compile
-              (add-to-list 'load-path "/Users/johnw/.emacs.d/my-load-path"))
+            (add-to-list 'load-path ,(pred stringp)))
           (when (featurep 'foo)
             (eval-and-compile
               (setq-default notmuch-command
                             (executable-find "notmuch")))
             (when (symbol-value 'notmuch-command)
-                (require 'notmuch nil nil)))))))))
+              (require 'notmuch nil nil))))))))
 
 (ert-deftest bind-key/:prefix-map ()
   (match-expansion