forked from mirrors/org-mode
1a5e3f931c
Mainly, add the corresponding cookie, but also add various `require`s so that the compiler knows which vars should be trated as dynbound. This does not fix all the warnings, but does try to eliminate all those about "unused" variables. For the variables truly unused, the patch usually adds an underscore to their name to silence the warning. Some of the fixes affect files which already used `lexical-binding`. Not sure why the test worked before: maybe because the tests were run without compiling them first (which could cause some of the missing `require`d packages to be autoloaded before we got to the problematic code, thus hiding the problem)? I found some suspicious code, for which I added FIXMEs. There are also a few changes to the main files. * lisp/org-protocol.el (org-protocol-check-filename-for-protocol): Don't call `server-edit` if it's not yet defined. [ Needed to get the tests to pass. ] * lisp/ob-core.el (org-babel-temporary-directory) (org-babel-temporary-stable-directory): Always define (and use nil if we don't want to create a directory for it). Simplify the code based on the fact that (defvar V E) only evaluates E if V is not yet `boundp`. (org-babel-temp-file, org-babel-temp-stable-file) (org-babel-remove-temporary-directory) (org-babel-remove-temporary-stable-directory): Adjust accordingly. * lisp/org.el (org-log-beginning): Add FIXME. * testing/org-test.el: Require `org` and `org-id`. (org-id-locations-file): Don't `defconst` it. (org-test-at-id, org-test-in-example-file, org-test-at-marker) (org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug specs into `declare` (and simplify them). (org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars. (org--compile-when): Fix quoting of `exp`. (org-test-load): Tweak regexps. * testing/org-batch-test-init.el: Tweak regexp, remove dead code and add a FIXME about it. * testing/lisp/test-ox.el: Require `ox` instead of erroring out if it's not already loaded. Also require `org-inlinetask`. (org-test-with-parsed-data): Silence warnings when `info` is not used. (test-org-export/bind-keyword): Add FIXME. * testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`. (test-org-publish/resolve-external-link): Expose lambdas to the compiler. Remove unused var `ids`. (test-org-publish/get-project-from-filename): Remove unused var `file`. * testing/lisp/test-org.el: Require `org-macs`, `org`, `org-inlinetask`, `org-refile`, and `org-agenda`. (test-org/org-read-date): Declare `org-time-was-given` as dynbound. (test-org/set-regexps-and-options): Add FIXME. * testing/lisp/test-org-timer.el: Require `org-timer`. * testing/lisp/test-org-table.el: Require `ox`. * testing/lisp/test-org-protocol.el: Require `org-protocol` instead of erroring out if it's not already loaded. Also require `capture`, and add missing `provide` statement. * testing/lisp/test-org-pcomplete.el: Require `org`. * testing/lisp/test-org-list.el: Require `org-list` and `org`. * testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`. * testing/lisp/test-org-footnote.el: Require `org-footnote`. * testing/lisp/test-org-element.el: Require `org-element` instead of erroring out if it's not already loaded. Also require `org` and `org-inlinetask`. * testing/lisp/test-org-duration.el: Require `org-duration`. * testing/lisp/test-org-datetree.el: Require `org-datetree`. * testing/lisp/test-org-colview.el: Require `org-colview`, `org-duration`, and `org-inlinetask`. * testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`. * testing/lisp/test-org-archive.el: Require `org-archive`. * testing/lisp/test-org-agenda.el (test-org-agenda/bulk-custom-arg-func): Add FIXME. * testing/lisp/test-ol.el: Require `ol` and `org-id`. (test-org-link/store-link): Declare `org-store-link-props` and add FIXME. * testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME. * testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`, and `org-table`. (test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and declare it as dynbound. (test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME. (test-ob/noweb-expansions-in-cache): Declare `noweb-expansions-in-cache-var` as dynbound. * testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`. * testing/lisp/test-ob-shell.el: * testing/lisp/test-ob-python.el: Require `ob-core`. * testing/lisp/test-ob-lob.el: Require `ob-lob`. (temporary-value-for-test): Declare as dynbound. * testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of erroring out if it's not already loaded. * testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of erroring out if it's not already loaded. Use `with-current-buffer`. * testing/lisp/test-ob-julia.el: Require `ob-core`. * testing/lisp/test-ob-java.el (org-babel-temporary-directory): Remove dead code now that `org-babel-temporary-directory` is always bound. * testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`. (ob-exp/evaluate-all-executables-in-order): Declare `*evaluation-collector*` as dynbound. * testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit) (ob-emacs-lisp/dynamic-lexical-execute): Rename dynbound var to `ob-emacs--x` and declare it as such. * testing/lisp/test-ob-R.el: Require `ob-core`. (ess-ask-for-ess-directory, ess-history-file): Declare vars.
275 lines
6.9 KiB
EmacsLisp
275 lines
6.9 KiB
EmacsLisp
;;; test-ob-python.el --- tests for ob-python.el -*- lexical-binding: t; -*-
|
|
|
|
;; Copyright (c) 2011-2014, 2019 Eric Schulte
|
|
;; Authors: Eric Schulte
|
|
|
|
;; This file is not part of GNU Emacs.
|
|
|
|
;; This program is free software; you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
;; (at your option) any later version.
|
|
|
|
;; This program is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
;;; Code:
|
|
(org-test-for-executable "python")
|
|
(require 'ob-core)
|
|
(unless (featurep 'ob-python)
|
|
(signal 'missing-test-dependency "Support for Python code blocks"))
|
|
|
|
(ert-deftest test-ob-python/colnames-yes-header-argument ()
|
|
(should
|
|
(equal '(("col") hline ("a") ("b"))
|
|
(org-test-with-temp-text "#+name: eg
|
|
| col |
|
|
|-----|
|
|
| a |
|
|
| b |
|
|
|
|
#+header: :colnames yes
|
|
#+header: :var x = eg
|
|
<point>#+begin_src python
|
|
return x
|
|
#+end_src"
|
|
(org-babel-execute-src-block)))))
|
|
|
|
(ert-deftest test-ob-python/colnames-yes-header-argument-again ()
|
|
(should
|
|
(equal '(("a") hline ("b*") ("c*"))
|
|
(org-test-with-temp-text "#+name: less-cols
|
|
| a |
|
|
|---|
|
|
| b |
|
|
| c |
|
|
|
|
#+header: :colnames yes
|
|
<point>#+begin_src python :var tab=less-cols
|
|
return [[val + '*' for val in row] for row in tab]
|
|
#+end_src"
|
|
(org-babel-execute-src-block)))))
|
|
|
|
(ert-deftest test-ob-python/colnames-nil-header-argument ()
|
|
(should
|
|
(equal '(("col") hline ("a") ("b"))
|
|
(org-test-with-temp-text "#+name: eg
|
|
| col |
|
|
|-----|
|
|
| a |
|
|
| b |
|
|
|
|
#+header: :colnames nil
|
|
#+header: :var x = eg
|
|
<point>#+begin_src python
|
|
return x
|
|
#+end_src"
|
|
(org-babel-execute-src-block)))))
|
|
|
|
(ert-deftest test-ob-python/colnames-no-header-argument-again ()
|
|
(should
|
|
(equal '(("a*") ("b*") ("c*"))
|
|
(org-test-with-temp-text "#+name: less-cols
|
|
| a |
|
|
|---|
|
|
| b |
|
|
| c |
|
|
|
|
#+header: :colnames no
|
|
<point>#+begin_src python :var tab=less-cols
|
|
return [[val + '*' for val in row] for row in tab]
|
|
#+end_src"
|
|
(org-babel-execute-src-block)))))
|
|
|
|
(ert-deftest test-ob-python/colnames-no-header-argument ()
|
|
(should
|
|
(equal '(("col") ("a") ("b"))
|
|
(org-test-with-temp-text "#+name: eg
|
|
| col |
|
|
|-----|
|
|
| a |
|
|
| b |
|
|
|
|
#+header: :colnames no
|
|
#+header: :var x = eg
|
|
<point>#+begin_src python
|
|
return x
|
|
#+end_src"
|
|
(org-babel-execute-src-block)))))
|
|
|
|
(ert-deftest test-ob-python/session-multiline ()
|
|
(should
|
|
(equal "20"
|
|
(org-test-with-temp-text "#+begin_src python :session :results output
|
|
foo = 0
|
|
for _ in range(10):
|
|
foo += 1
|
|
|
|
foo += 1
|
|
|
|
print(foo)
|
|
#+end_src"
|
|
(org-babel-execute-src-block)))))
|
|
|
|
(ert-deftest test-ob-python/insert-necessary-blank-line-when-sending-code-to-interpreter ()
|
|
(should
|
|
(equal 2 (org-test-with-temp-text "#+begin_src python :session :results value
|
|
if True:
|
|
1
|
|
2
|
|
#+end_src"
|
|
;; Previously, while adding `:session' to a normal code
|
|
;; block, also need to add extra blank lines to end
|
|
;; indent block or indicate logical sections. Now, the
|
|
;; `org-babel-python-evaluate-session' can do it
|
|
;; automatically:
|
|
;;
|
|
;; >>> if True:
|
|
;; >>> 1
|
|
;; >>> <insert_blank_line_here>
|
|
;; >>> 2
|
|
(org-babel-execute-maybe)
|
|
(org-babel-execute-src-block)))))
|
|
|
|
(ert-deftest test-ob-python/if-else-block ()
|
|
(should
|
|
(equal "success" (org-test-with-temp-text "#+begin_src python :session :results value
|
|
value = 'failure'
|
|
if False:
|
|
pass
|
|
else:
|
|
value = 'success'
|
|
value
|
|
#+end_src"
|
|
(org-babel-execute-src-block)))))
|
|
|
|
(ert-deftest test-ob-python/indent-block-with-blank-lines ()
|
|
(should
|
|
(equal 20
|
|
(org-test-with-temp-text "#+begin_src python :session :results value
|
|
foo = 0
|
|
for i in range(10):
|
|
foo += 1
|
|
|
|
foo += 1
|
|
|
|
foo
|
|
#+end_src"
|
|
(org-babel-execute-src-block)))))
|
|
|
|
(ert-deftest test-ob-python/assign-underscore ()
|
|
(should
|
|
(equal "success"
|
|
(org-test-with-temp-text "#+begin_src python :session :results value
|
|
_ = 'failure'
|
|
'success'
|
|
#+end_src"
|
|
(org-babel-execute-src-block)))))
|
|
|
|
(ert-deftest test-ob-python/multiline-var ()
|
|
(should
|
|
(equal "a\nb\nc"
|
|
(org-test-with-temp-text "#+begin_src python :var text=\"a\\nb\\nc\"
|
|
return text
|
|
#+end_src"
|
|
(org-babel-execute-src-block)))))
|
|
|
|
(ert-deftest test-ob-python/multiline-str ()
|
|
(should
|
|
(equal "a\nb\nc"
|
|
(org-test-with-temp-text "#+begin_src python
|
|
text=\"a\\nb\\nc\"
|
|
return text
|
|
#+end_src"
|
|
(org-babel-execute-src-block)))))
|
|
|
|
(ert-deftest test-ob-python/header-var-assignment ()
|
|
(should
|
|
(equal "success"
|
|
(org-test-with-temp-text "#+begin_src python :var text=\"failure\"
|
|
text
|
|
text=\"success\"
|
|
return text
|
|
#+end_src"
|
|
(org-babel-execute-src-block)))))
|
|
|
|
(ert-deftest test-ob-python/session-value-sleep ()
|
|
(should
|
|
(equal "success"
|
|
(org-test-with-temp-text "#+begin_src python :session :results value
|
|
import time
|
|
time.sleep(.1)
|
|
'success'
|
|
#+end_src"
|
|
(org-babel-execute-src-block)))))
|
|
|
|
(ert-deftest test-ob-python/async-simple-session-output ()
|
|
(let ((org-babel-temporary-directory temporary-file-directory)
|
|
(org-confirm-babel-evaluate nil))
|
|
(org-test-with-temp-text
|
|
"#+begin_src python :session :async yes :results output
|
|
import time
|
|
time.sleep(.1)
|
|
print('Yep!')
|
|
#+end_src\n"
|
|
(should (let ((expected "Yep!"))
|
|
(and (not (string= expected (org-babel-execute-src-block)))
|
|
(string= expected
|
|
(progn
|
|
(sleep-for 0 200)
|
|
(goto-char (org-babel-where-is-src-block-result))
|
|
(org-babel-read-result)))))))))
|
|
|
|
(ert-deftest test-ob-python/async-named-output ()
|
|
(let (org-confirm-babel-evaluate
|
|
(org-babel-temporary-directory temporary-file-directory)
|
|
(src-block "#+begin_src python :async :session :results output
|
|
print(\"Yep!\")
|
|
#+end_src")
|
|
(results-before "
|
|
|
|
#+NAME: foobar
|
|
#+RESULTS:
|
|
: Nope!")
|
|
(results-after "
|
|
|
|
#+NAME: foobar
|
|
#+RESULTS:
|
|
: Yep!
|
|
"))
|
|
(org-test-with-temp-text
|
|
(concat src-block results-before)
|
|
(should (progn (org-babel-execute-src-block)
|
|
(sleep-for 0 200)
|
|
(string= (concat src-block results-after)
|
|
(buffer-string)))))))
|
|
|
|
(ert-deftest test-ob-python/async-output-drawer ()
|
|
(let (org-confirm-babel-evaluate
|
|
(org-babel-temporary-directory temporary-file-directory)
|
|
(src-block "#+begin_src python :async :session :results output drawer
|
|
print(list(range(3)))
|
|
#+end_src")
|
|
(result "
|
|
|
|
#+RESULTS:
|
|
:results:
|
|
[0, 1, 2]
|
|
:end:
|
|
"))
|
|
(org-test-with-temp-text
|
|
src-block
|
|
(should (progn (org-babel-execute-src-block)
|
|
(sleep-for 0 200)
|
|
(string= (concat src-block result)
|
|
(buffer-string)))))))
|
|
|
|
(provide 'test-ob-python)
|
|
|
|
;;; test-ob-python.el ends here
|