diff options
author | Stefan Monnier <monnier@iro.umontreal.ca> | 2023-03-27 17:16:58 -0400 |
---|---|---|
committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2023-03-27 17:16:58 -0400 |
commit | 616b22b5b95ce442ee343a18bfbf9ef18d8bb04f (patch) | |
tree | 5fd048b91fc3b4f65e47c6a838306af01942abdd /test | |
parent | cd62dc0dd2d371f45e6e0b4f031b7deb674edf39 (diff) | |
parent | 8f42db010d15efa21fb9007e61daedbe1e2dfa53 (diff) | |
download | emacs-616b22b5b95ce442ee343a18bfbf9ef18d8bb04f.tar.gz |
Merge from origin/emacs-29
8f42db010d1 Improve indenting "case" in Python
c4d490490dc ; * test/src/fns-tests.el: Fix last change
875e77a66a6 * test/infra/Dockerfile.emba (emacs-native-comp): Add zli...
64a2b0d36fe Fix failure of fns-tests-collate-strings on Cygwin
90fc6b987ad * lisp/savehist.el (savehist-save): Preserve shared struc...
08fbc133756 Adapt Tramp manual
accb3871668 Fix system time sampling on MS-Windows
33d436eefa1 Fix treesit_ensure_parsed (bug#62333)
d93a439846f * lisp/help-fns.el (find-lisp-object-file-name): Fix bug#...
be8147c53f9 Improve "Bugs" in the Emacs manual
Diffstat (limited to 'test')
-rw-r--r-- | test/infra/Dockerfile.emba | 2 | ||||
-rw-r--r-- | test/lisp/progmodes/python-tests.el | 38 | ||||
-rw-r--r-- | test/src/fns-tests.el | 2 |
3 files changed, 40 insertions, 2 deletions
diff --git a/test/infra/Dockerfile.emba b/test/infra/Dockerfile.emba index 0fa642d983b..9377a3b5f87 100644 --- a/test/infra/Dockerfile.emba +++ b/test/infra/Dockerfile.emba @@ -100,7 +100,7 @@ FROM emacs-base as emacs-native-comp # The libgccjit version must correspond to the gcc version. RUN apt-get update && \ apt-get install -y --no-install-recommends -o=Dpkg::Use-Pty=0 \ - libgccjit-10-dev \ + libgccjit-10-dev zlib1g-dev \ && rm -rf /var/lib/apt/lists/* FROM emacs-native-comp as emacs-native-comp-speed0 diff --git a/test/lisp/progmodes/python-tests.el b/test/lisp/progmodes/python-tests.el index ed4a08da6ab..50153e66da5 100644 --- a/test/lisp/progmodes/python-tests.el +++ b/test/lisp/progmodes/python-tests.el @@ -5940,6 +5940,26 @@ def func(): (equal (list (python-tests-look-at "if (" -1 t)) (python-info-dedenter-opening-block-positions))))) +(ert-deftest python-info-dedenter-opening-block-positions-7 () + "Test case blocks." + (python-tests-with-temp-buffer + " +match a: + case 1: + match b: + case 2: + something() + case 3: +" + (python-tests-look-at "case 1:") + (should-not (python-info-dedenter-opening-block-positions)) + (python-tests-look-at "case 2:") + (should-not (python-info-dedenter-opening-block-positions)) + (python-tests-look-at "case 3:") + (equal (list (python-tests-look-at "case 2:" -1) + (python-tests-look-at "case 1:" -1 t)) + (python-info-dedenter-opening-block-positions)))) + (ert-deftest python-info-dedenter-opening-block-message-1 () "Test dedenters inside strings are ignored." (python-tests-with-temp-buffer @@ -6125,6 +6145,24 @@ elif b: (point)) (python-info-dedenter-statement-p))))) +(ert-deftest python-info-dedenter-statement-p-6 () + "Test case keyword." + (python-tests-with-temp-buffer + " +match a: # Comment + case 1: + match b: + case 2: + something() + case 3: +" + (python-tests-look-at "case 1:") + (should-not (python-info-dedenter-statement-p)) + (python-tests-look-at "case 2:") + (should-not (python-info-dedenter-statement-p)) + (python-tests-look-at "case 3:") + (should (= (point) (python-info-dedenter-statement-p))))) + (ert-deftest python-info-line-ends-backslash-p-1 () (python-tests-with-temp-buffer " diff --git a/test/src/fns-tests.el b/test/src/fns-tests.el index 0321b92d0bc..6f79d3277a8 100644 --- a/test/src/fns-tests.el +++ b/test/src/fns-tests.el @@ -254,7 +254,7 @@ (should (string-collate-equalp "xyzzy" "XYZZY" nil t)) ;; Locale must be valid. - (should-error (string-collate-equalp "xyzzy" "xyzzy" "en_DE.UTF-8"))) + (should-error (string-collate-equalp "xyzzy" "xyzzy" "en_XY.UTF-8"))) ;; There must be a check for valid codepoints. (Check not implemented yet) ; (should-error |