diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2023-04-11 10:33:32 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2023-04-11 10:33:32 +0300 |
| commit | c62afb10cf0bbeae6a540f4e05b7a23536636cd0 (patch) | |
| tree | 3656258b3ec3eed1f8a7f426aabf2fdfe8432596 | |
| parent | f2d212c696692879254b7fc7ca2a9b0a2999e557 (diff) | |
| download | emacs-c62afb10cf0bbeae6a540f4e05b7a23536636cd0.tar.gz | |
Fix wallpaper-tests on MS-Windows
* test/lisp/image/wallpaper-tests.el (wallpaper--find-setter)
(wallpaper--find-setter/call-predicate)
(wallpaper--find-setter/set-current-setter)
(wallpaper-set/calls-init-action)
(wallpaper-set/calls-wallpaper-set-function)
(wallpaper-set/runs-command, wallpaper-set/runs-command/detach):
Skip these tests if native functions are used for changing
wallpaper. These tests are irrelevant in that case.
| -rw-r--r-- | test/lisp/image/wallpaper-tests.el | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/test/lisp/image/wallpaper-tests.el b/test/lisp/image/wallpaper-tests.el index 94b4d8b2dbb..2e4e36030d4 100644 --- a/test/lisp/image/wallpaper-tests.el +++ b/test/lisp/image/wallpaper-tests.el @@ -24,7 +24,8 @@ (require 'wallpaper) (ert-deftest wallpaper--find-setter () - (skip-unless (executable-find "touch")) + (skip-unless (and (executable-find "touch") + (wallpaper--use-default-set-function-p))) (let (wallpaper--current-setter (wallpaper--default-setters (wallpaper--default-methods-create @@ -32,7 +33,8 @@ (should (wallpaper--find-setter)))) (ert-deftest wallpaper--find-setter/call-predicate () - (skip-unless (executable-find "touch")) + (skip-unless (and (executable-find "touch") + (wallpaper--use-default-set-function-p))) (let* ( wallpaper--current-setter called (wallpaper--default-setters (wallpaper--default-methods-create @@ -43,7 +45,8 @@ (should called))) (ert-deftest wallpaper--find-setter/set-current-setter () - (skip-unless (executable-find "touch")) + (skip-unless (and (executable-find "touch") + (wallpaper--use-default-set-function-p))) (let (wallpaper--current-setter (wallpaper--default-setters (wallpaper--default-methods-create @@ -52,7 +55,8 @@ (should wallpaper--current-setter))) (ert-deftest wallpaper-set/runs-command () - (skip-unless (executable-find "touch")) + (skip-unless (and (executable-find "touch") + (wallpaper--use-default-set-function-p))) (ert-with-temp-file fil-jpg :suffix ".jpg" (ert-with-temp-file fil @@ -70,7 +74,8 @@ (should (file-exists-p fil))))))) (ert-deftest wallpaper-set/runs-command/detach () - (skip-unless (executable-find "touch")) + (skip-unless (and (executable-find "touch") + (wallpaper--use-default-set-function-p))) (ert-with-temp-file fil-jpg :suffix ".jpg" (ert-with-temp-file fil @@ -89,7 +94,8 @@ (should (file-exists-p fil)))))) (ert-deftest wallpaper-set/calls-init-action () - (skip-unless (executable-find "touch")) + (skip-unless (and (executable-find "touch") + (wallpaper--use-default-set-function-p))) (ert-with-temp-file fil-jpg :suffix ".jpg" (ert-with-temp-file fil @@ -108,7 +114,8 @@ (should called))))) (ert-deftest wallpaper-set/calls-wallpaper-set-function () - (skip-unless (executable-find "touch")) + (skip-unless (and (executable-find "touch") + (wallpaper--use-default-set-function-p))) (ert-with-temp-file fil-jpg :suffix ".jpg" (let* ( wallpaper--current-setter called |