aboutsummaryrefslogtreecommitdiffstats
path: root/test/automated/python-tests.el
diff options
context:
space:
mode:
authorPaul Eggert2015-09-03 22:13:31 -0700
committerPaul Eggert2015-09-03 22:14:33 -0700
commit4874f0bbac9362250d4ea0d04ec6c46af4d2fa0b (patch)
tree3dedd9e6e2cf9400094b782ddd9335364d209648 /test/automated/python-tests.el
parent26bd978d87dfbf9baa115cd961a67d42b416c4bf (diff)
downloademacs-4874f0bbac9362250d4ea0d04ec6c46af4d2fa0b.tar.gz
emacs-4874f0bbac9362250d4ea0d04ec6c46af4d2fa0b.zip
Support automated ‘make check’ in non-C locale
This lets the builder optionally test Emacs behavior in other locales. The C locale is still the default for tests. * test/automated/Makefile.in (TEST_LOCALE): New macro. (emacs): Use it. * test/automated/flymake-tests.el (flymake-tests--current-face): Use C locale for subprocesses so that tests behave as expected. * test/automated/python-tests.el: (python-shell-prompt-validate-regexps-1) (python-shell-prompt-validate-regexps-2) (python-shell-prompt-validate-regexps-3) (python-shell-prompt-validate-regexps-4) (python-shell-prompt-validate-regexps-5) (python-shell-prompt-validate-regexps-6) (python-shell-prompt-set-calculated-regexps-1): Adjust expected output to match locale. * test/automated/tildify-tests.el (tildify-test--test) (tildify-space-test--test, tildify-space-undo-test--test): This test assumes UTF-8 encoding.
Diffstat (limited to 'test/automated/python-tests.el')
-rw-r--r--test/automated/python-tests.el21
1 files changed, 14 insertions, 7 deletions
diff --git a/test/automated/python-tests.el b/test/automated/python-tests.el
index 219f99eed62..d9b4c3e1b06 100644
--- a/test/automated/python-tests.el
+++ b/test/automated/python-tests.el
@@ -2920,7 +2920,8 @@ and `python-shell-interpreter-args' in the new shell buffer."
2920 :type 'user-error))) 2920 :type 'user-error)))
2921 (should 2921 (should
2922 (string= (cadr error-data) 2922 (string= (cadr error-data)
2923 "Invalid regexp \\( in `python-shell-prompt-input-regexps'")))) 2923 (format-message
2924 "Invalid regexp \\( in `python-shell-prompt-input-regexps'")))))
2924 2925
2925(ert-deftest python-shell-prompt-validate-regexps-2 () 2926(ert-deftest python-shell-prompt-validate-regexps-2 ()
2926 "Check `python-shell-prompt-output-regexps' are validated." 2927 "Check `python-shell-prompt-output-regexps' are validated."
@@ -2929,7 +2930,8 @@ and `python-shell-interpreter-args' in the new shell buffer."
2929 :type 'user-error))) 2930 :type 'user-error)))
2930 (should 2931 (should
2931 (string= (cadr error-data) 2932 (string= (cadr error-data)
2932 "Invalid regexp \\( in `python-shell-prompt-output-regexps'")))) 2933 (format-message
2934 "Invalid regexp \\( in `python-shell-prompt-output-regexps'")))))
2933 2935
2934(ert-deftest python-shell-prompt-validate-regexps-3 () 2936(ert-deftest python-shell-prompt-validate-regexps-3 ()
2935 "Check `python-shell-prompt-regexp' is validated." 2937 "Check `python-shell-prompt-regexp' is validated."
@@ -2938,7 +2940,8 @@ and `python-shell-interpreter-args' in the new shell buffer."
2938 :type 'user-error))) 2940 :type 'user-error)))
2939 (should 2941 (should
2940 (string= (cadr error-data) 2942 (string= (cadr error-data)
2941 "Invalid regexp \\( in `python-shell-prompt-regexp'")))) 2943 (format-message
2944 "Invalid regexp \\( in `python-shell-prompt-regexp'")))))
2942 2945
2943(ert-deftest python-shell-prompt-validate-regexps-4 () 2946(ert-deftest python-shell-prompt-validate-regexps-4 ()
2944 "Check `python-shell-prompt-block-regexp' is validated." 2947 "Check `python-shell-prompt-block-regexp' is validated."
@@ -2947,7 +2950,8 @@ and `python-shell-interpreter-args' in the new shell buffer."
2947 :type 'user-error))) 2950 :type 'user-error)))
2948 (should 2951 (should
2949 (string= (cadr error-data) 2952 (string= (cadr error-data)
2950 "Invalid regexp \\( in `python-shell-prompt-block-regexp'")))) 2953 (format-message
2954 "Invalid regexp \\( in `python-shell-prompt-block-regexp'")))))
2951 2955
2952(ert-deftest python-shell-prompt-validate-regexps-5 () 2956(ert-deftest python-shell-prompt-validate-regexps-5 ()
2953 "Check `python-shell-prompt-pdb-regexp' is validated." 2957 "Check `python-shell-prompt-pdb-regexp' is validated."
@@ -2956,7 +2960,8 @@ and `python-shell-interpreter-args' in the new shell buffer."
2956 :type 'user-error))) 2960 :type 'user-error)))
2957 (should 2961 (should
2958 (string= (cadr error-data) 2962 (string= (cadr error-data)
2959 "Invalid regexp \\( in `python-shell-prompt-pdb-regexp'")))) 2963 (format-message
2964 "Invalid regexp \\( in `python-shell-prompt-pdb-regexp'")))))
2960 2965
2961(ert-deftest python-shell-prompt-validate-regexps-6 () 2966(ert-deftest python-shell-prompt-validate-regexps-6 ()
2962 "Check `python-shell-prompt-output-regexp' is validated." 2967 "Check `python-shell-prompt-output-regexp' is validated."
@@ -2965,7 +2970,8 @@ and `python-shell-interpreter-args' in the new shell buffer."
2965 :type 'user-error))) 2970 :type 'user-error)))
2966 (should 2971 (should
2967 (string= (cadr error-data) 2972 (string= (cadr error-data)
2968 "Invalid regexp \\( in `python-shell-prompt-output-regexp'")))) 2973 (format-message
2974 "Invalid regexp \\( in `python-shell-prompt-output-regexp'")))))
2969 2975
2970(ert-deftest python-shell-prompt-validate-regexps-7 () 2976(ert-deftest python-shell-prompt-validate-regexps-7 ()
2971 "Check default regexps are valid." 2977 "Check default regexps are valid."
@@ -2982,7 +2988,8 @@ and `python-shell-interpreter-args' in the new shell buffer."
2982 :type 'user-error))) 2988 :type 'user-error)))
2983 (should 2989 (should
2984 (string= (cadr error-data) 2990 (string= (cadr error-data)
2985 "Invalid regexp \\( in `python-shell-prompt-output-regexp'")))) 2991 (format-message
2992 "Invalid regexp \\( in `python-shell-prompt-output-regexp'")))))
2986 2993
2987(ert-deftest python-shell-prompt-set-calculated-regexps-2 () 2994(ert-deftest python-shell-prompt-set-calculated-regexps-2 ()
2988 "Check `python-shell-prompt-input-regexps' are set." 2995 "Check `python-shell-prompt-input-regexps' are set."