testing: Make all files use `lexical-binding`
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.
2022-09-14 17:21:37 -04:00
|
|
|
;;; test-ob-python.el --- tests for ob-python.el -*- lexical-binding: t; -*-
|
2011-11-28 03:55:28 -05:00
|
|
|
|
2019-01-01 05:50:56 -05:00
|
|
|
;; Copyright (c) 2011-2014, 2019 Eric Schulte
|
2011-11-28 03:55:28 -05:00
|
|
|
;; Authors: Eric Schulte
|
|
|
|
|
2012-12-13 11:24:19 -05:00
|
|
|
;; 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
|
2021-03-20 03:27:57 -04:00
|
|
|
;; along with this program. If not, see <https://www.gnu.org/licenses/>.
|
2011-11-28 03:55:28 -05:00
|
|
|
|
2012-03-19 16:38:12 -04:00
|
|
|
;;; Code:
|
2011-11-28 03:55:28 -05:00
|
|
|
(org-test-for-executable "python")
|
testing: Make all files use `lexical-binding`
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.
2022-09-14 17:21:37 -04:00
|
|
|
(require 'ob-core)
|
2012-03-19 16:38:12 -04:00
|
|
|
(unless (featurep 'ob-python)
|
|
|
|
(signal 'missing-test-dependency "Support for Python code blocks"))
|
2011-11-28 03:55:28 -05:00
|
|
|
|
|
|
|
(ert-deftest test-ob-python/colnames-yes-header-argument ()
|
2019-12-22 08:51:57 -05:00
|
|
|
(should
|
|
|
|
(equal '(("col") hline ("a") ("b"))
|
|
|
|
(org-test-with-temp-text "#+name: eg
|
2011-11-28 03:55:28 -05:00
|
|
|
| col |
|
|
|
|
|-----|
|
|
|
|
| a |
|
|
|
|
| b |
|
|
|
|
|
|
|
|
#+header: :colnames yes
|
|
|
|
#+header: :var x = eg
|
2019-12-22 08:51:57 -05:00
|
|
|
<point>#+begin_src python
|
2011-11-28 03:55:28 -05:00
|
|
|
return x
|
|
|
|
#+end_src"
|
2019-12-22 08:51:57 -05:00
|
|
|
(org-babel-execute-src-block)))))
|
2011-11-28 03:55:28 -05:00
|
|
|
|
|
|
|
(ert-deftest test-ob-python/colnames-yes-header-argument-again ()
|
2019-12-22 08:51:57 -05:00
|
|
|
(should
|
|
|
|
(equal '(("a") hline ("b*") ("c*"))
|
|
|
|
(org-test-with-temp-text "#+name: less-cols
|
2011-11-28 03:55:28 -05:00
|
|
|
| a |
|
|
|
|
|---|
|
|
|
|
| b |
|
|
|
|
| c |
|
|
|
|
|
|
|
|
#+header: :colnames yes
|
2019-12-22 08:51:57 -05:00
|
|
|
<point>#+begin_src python :var tab=less-cols
|
2011-11-28 03:55:28 -05:00
|
|
|
return [[val + '*' for val in row] for row in tab]
|
|
|
|
#+end_src"
|
2019-12-22 08:51:57 -05:00
|
|
|
(org-babel-execute-src-block)))))
|
2011-11-28 03:55:28 -05:00
|
|
|
|
|
|
|
(ert-deftest test-ob-python/colnames-nil-header-argument ()
|
2019-12-22 08:51:57 -05:00
|
|
|
(should
|
|
|
|
(equal '(("col") hline ("a") ("b"))
|
|
|
|
(org-test-with-temp-text "#+name: eg
|
2011-11-28 03:55:28 -05:00
|
|
|
| col |
|
|
|
|
|-----|
|
|
|
|
| a |
|
|
|
|
| b |
|
|
|
|
|
|
|
|
#+header: :colnames nil
|
|
|
|
#+header: :var x = eg
|
2019-12-22 08:51:57 -05:00
|
|
|
<point>#+begin_src python
|
2011-11-28 03:55:28 -05:00
|
|
|
return x
|
|
|
|
#+end_src"
|
2019-12-22 08:51:57 -05:00
|
|
|
(org-babel-execute-src-block)))))
|
2011-11-28 03:55:28 -05:00
|
|
|
|
|
|
|
(ert-deftest test-ob-python/colnames-no-header-argument-again ()
|
2019-12-22 08:51:57 -05:00
|
|
|
(should
|
|
|
|
(equal '(("a*") ("b*") ("c*"))
|
|
|
|
(org-test-with-temp-text "#+name: less-cols
|
2011-11-28 03:55:28 -05:00
|
|
|
| a |
|
|
|
|
|---|
|
|
|
|
| b |
|
|
|
|
| c |
|
|
|
|
|
|
|
|
#+header: :colnames no
|
2019-12-22 08:51:57 -05:00
|
|
|
<point>#+begin_src python :var tab=less-cols
|
2011-11-28 03:55:28 -05:00
|
|
|
return [[val + '*' for val in row] for row in tab]
|
|
|
|
#+end_src"
|
2019-12-22 08:51:57 -05:00
|
|
|
(org-babel-execute-src-block)))))
|
2011-11-28 03:55:28 -05:00
|
|
|
|
|
|
|
(ert-deftest test-ob-python/colnames-no-header-argument ()
|
2019-12-22 08:51:57 -05:00
|
|
|
(should
|
|
|
|
(equal '(("col") ("a") ("b"))
|
|
|
|
(org-test-with-temp-text "#+name: eg
|
2011-11-28 03:55:28 -05:00
|
|
|
| col |
|
|
|
|
|-----|
|
|
|
|
| a |
|
|
|
|
| b |
|
|
|
|
|
|
|
|
#+header: :colnames no
|
|
|
|
#+header: :var x = eg
|
2019-12-22 08:51:57 -05:00
|
|
|
<point>#+begin_src python
|
2011-11-28 03:55:28 -05:00
|
|
|
return x
|
|
|
|
#+end_src"
|
2019-12-22 08:51:57 -05:00
|
|
|
(org-babel-execute-src-block)))))
|
2011-11-28 03:55:28 -05:00
|
|
|
|
2017-12-02 04:03:00 -05:00
|
|
|
(ert-deftest test-ob-python/session-multiline ()
|
2022-11-16 04:42:17 -05:00
|
|
|
;; Disable the test on older Emacs as built-in python.el sometimes
|
|
|
|
;; fail to initialize session.
|
|
|
|
(skip-unless (version<= "28" emacs-version))
|
2019-12-22 08:51:57 -05:00
|
|
|
(should
|
|
|
|
(equal "20"
|
|
|
|
(org-test-with-temp-text "#+begin_src python :session :results output
|
2017-12-02 04:03:00 -05:00
|
|
|
foo = 0
|
|
|
|
for _ in range(10):
|
|
|
|
foo += 1
|
|
|
|
|
|
|
|
foo += 1
|
|
|
|
|
|
|
|
print(foo)
|
|
|
|
#+end_src"
|
2019-12-22 08:51:57 -05:00
|
|
|
(org-babel-execute-src-block)))))
|
2017-12-02 04:03:00 -05:00
|
|
|
|
2018-04-01 04:34:32 -04:00
|
|
|
(ert-deftest test-ob-python/insert-necessary-blank-line-when-sending-code-to-interpreter ()
|
2022-11-16 04:42:17 -05:00
|
|
|
;; Disable the test on older Emacs as built-in python.el sometimes
|
|
|
|
;; fail to initialize session.
|
|
|
|
(skip-unless (version<= "28" emacs-version))
|
2019-12-22 08:51:57 -05:00
|
|
|
(should
|
|
|
|
(equal 2 (org-test-with-temp-text "#+begin_src python :session :results value
|
2018-04-01 04:34:32 -04:00
|
|
|
if True:
|
|
|
|
1
|
|
|
|
2
|
|
|
|
#+end_src"
|
2019-12-22 08:51:57 -05:00
|
|
|
;; 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)))))
|
2018-04-01 04:34:32 -04:00
|
|
|
|
ob-python: Fix several issues with :session :results value
* lisp/ob-python.el (org-babel-python-evaluate-session): Fix a few
related issues with :session :results value blocks, including broken
if-else statements, indented blocks with blank lines, and returning
the wrong value when underscore has been used.
(org-babel-python--eval-ast): New constant variable, a string
consisting of Python code to execute a source block using ast.
Previously, python blocks with parameters ":session :results value"
were entered line-by-line into the Python session, which could cause
issues around indentation and new lines. Now, such python blocks are
written to temp files, then the built-in ast python module is used to
parse and execute them, and to extract the last line separately to
return as a result. Introduces a change in behavior, requiring that
the last line must be a top-level expression statement if its result
is to be saved (otherwise, the result is None).
2020-01-20 20:40:22 -05:00
|
|
|
(ert-deftest test-ob-python/if-else-block ()
|
2022-11-16 04:42:17 -05:00
|
|
|
;; Disable the test on older Emacs as built-in python.el sometimes
|
|
|
|
;; fail to initialize session.
|
|
|
|
(skip-unless (version<= "28" emacs-version))
|
ob-python: Fix several issues with :session :results value
* lisp/ob-python.el (org-babel-python-evaluate-session): Fix a few
related issues with :session :results value blocks, including broken
if-else statements, indented blocks with blank lines, and returning
the wrong value when underscore has been used.
(org-babel-python--eval-ast): New constant variable, a string
consisting of Python code to execute a source block using ast.
Previously, python blocks with parameters ":session :results value"
were entered line-by-line into the Python session, which could cause
issues around indentation and new lines. Now, such python blocks are
written to temp files, then the built-in ast python module is used to
parse and execute them, and to extract the last line separately to
return as a result. Introduces a change in behavior, requiring that
the last line must be a top-level expression statement if its result
is to be saved (otherwise, the result is None).
2020-01-20 20:40:22 -05:00
|
|
|
(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"
|
2022-11-16 04:42:17 -05:00
|
|
|
(org-babel-execute-src-block)))))
|
ob-python: Fix several issues with :session :results value
* lisp/ob-python.el (org-babel-python-evaluate-session): Fix a few
related issues with :session :results value blocks, including broken
if-else statements, indented blocks with blank lines, and returning
the wrong value when underscore has been used.
(org-babel-python--eval-ast): New constant variable, a string
consisting of Python code to execute a source block using ast.
Previously, python blocks with parameters ":session :results value"
were entered line-by-line into the Python session, which could cause
issues around indentation and new lines. Now, such python blocks are
written to temp files, then the built-in ast python module is used to
parse and execute them, and to extract the last line separately to
return as a result. Introduces a change in behavior, requiring that
the last line must be a top-level expression statement if its result
is to be saved (otherwise, the result is None).
2020-01-20 20:40:22 -05:00
|
|
|
|
|
|
|
(ert-deftest test-ob-python/indent-block-with-blank-lines ()
|
2022-11-16 04:42:17 -05:00
|
|
|
;; Disable the test on older Emacs as built-in python.el sometimes
|
|
|
|
;; fail to initialize session.
|
|
|
|
(skip-unless (version<= "28" emacs-version))
|
ob-python: Fix several issues with :session :results value
* lisp/ob-python.el (org-babel-python-evaluate-session): Fix a few
related issues with :session :results value blocks, including broken
if-else statements, indented blocks with blank lines, and returning
the wrong value when underscore has been used.
(org-babel-python--eval-ast): New constant variable, a string
consisting of Python code to execute a source block using ast.
Previously, python blocks with parameters ":session :results value"
were entered line-by-line into the Python session, which could cause
issues around indentation and new lines. Now, such python blocks are
written to temp files, then the built-in ast python module is used to
parse and execute them, and to extract the last line separately to
return as a result. Introduces a change in behavior, requiring that
the last line must be a top-level expression statement if its result
is to be saved (otherwise, the result is None).
2020-01-20 20:40:22 -05:00
|
|
|
(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 ()
|
2022-11-15 21:26:12 -05:00
|
|
|
;; Disable the test on older Emacs as built-in python.el sometimes
|
2022-11-16 03:31:40 -05:00
|
|
|
;; fail to initialize session.
|
2022-11-15 21:26:12 -05:00
|
|
|
(skip-unless (version<= "28" emacs-version))
|
2022-11-15 02:04:08 -05:00
|
|
|
(let ((result
|
|
|
|
(org-test-with-temp-text "#+begin_src python :session :results value
|
ob-python: Fix several issues with :session :results value
* lisp/ob-python.el (org-babel-python-evaluate-session): Fix a few
related issues with :session :results value blocks, including broken
if-else statements, indented blocks with blank lines, and returning
the wrong value when underscore has been used.
(org-babel-python--eval-ast): New constant variable, a string
consisting of Python code to execute a source block using ast.
Previously, python blocks with parameters ":session :results value"
were entered line-by-line into the Python session, which could cause
issues around indentation and new lines. Now, such python blocks are
written to temp files, then the built-in ast python module is used to
parse and execute them, and to extract the last line separately to
return as a result. Introduces a change in behavior, requiring that
the last line must be a top-level expression statement if its result
is to be saved (otherwise, the result is None).
2020-01-20 20:40:22 -05:00
|
|
|
_ = 'failure'
|
|
|
|
'success'
|
|
|
|
#+end_src"
|
2022-11-15 02:04:08 -05:00
|
|
|
(org-babel-execute-src-block))))
|
|
|
|
(should (equal "success" result))))
|
ob-python: Fix several issues with :session :results value
* lisp/ob-python.el (org-babel-python-evaluate-session): Fix a few
related issues with :session :results value blocks, including broken
if-else statements, indented blocks with blank lines, and returning
the wrong value when underscore has been used.
(org-babel-python--eval-ast): New constant variable, a string
consisting of Python code to execute a source block using ast.
Previously, python blocks with parameters ":session :results value"
were entered line-by-line into the Python session, which could cause
issues around indentation and new lines. Now, such python blocks are
written to temp files, then the built-in ast python module is used to
parse and execute them, and to extract the last line separately to
return as a result. Introduces a change in behavior, requiring that
the last line must be a top-level expression statement if its result
is to be saved (otherwise, the result is None).
2020-01-20 20:40:22 -05:00
|
|
|
|
2020-05-24 11:14:03 -04:00
|
|
|
(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)))))
|
|
|
|
|
2020-06-06 13:59:23 -04:00
|
|
|
(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)))))
|
|
|
|
|
2020-09-04 20:37:05 -04:00
|
|
|
(ert-deftest test-ob-python/session-value-sleep ()
|
2022-11-16 03:31:40 -05:00
|
|
|
;; Disable the test on older Emacs as built-in python.el sometimes
|
|
|
|
;; fail to initialize session.
|
|
|
|
(skip-unless (version<= "28" emacs-version))
|
2020-09-04 20:37:05 -04:00
|
|
|
(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)))))
|
|
|
|
|
2021-05-18 11:45:05 -04:00
|
|
|
(ert-deftest test-ob-python/async-simple-session-output ()
|
2022-11-16 03:31:40 -05:00
|
|
|
;; Disable the test on older Emacs as built-in python.el sometimes
|
|
|
|
;; fail to initialize session.
|
|
|
|
(skip-unless (version<= "28" emacs-version))
|
2021-05-18 11:45:05 -04:00
|
|
|
(let ((org-babel-temporary-directory temporary-file-directory)
|
|
|
|
(org-confirm-babel-evaluate nil))
|
|
|
|
(org-test-with-temp-text
|
2022-11-16 03:31:40 -05:00
|
|
|
"#+begin_src python :session :async yes :results output
|
2021-05-18 11:45:05 -04:00
|
|
|
import time
|
|
|
|
time.sleep(.1)
|
|
|
|
print('Yep!')
|
|
|
|
#+end_src\n"
|
2022-11-16 03:31:40 -05:00
|
|
|
(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)))))))))
|
2021-05-18 11:45:05 -04:00
|
|
|
|
|
|
|
(ert-deftest test-ob-python/async-named-output ()
|
2022-11-16 03:31:40 -05:00
|
|
|
;; Disable the test on older Emacs as built-in python.el sometimes
|
|
|
|
;; fail to initialize session.
|
|
|
|
(skip-unless (version<= "28" emacs-version))
|
2021-05-18 11:45:05 -04:00
|
|
|
(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
|
2022-11-16 03:31:40 -05:00
|
|
|
(concat src-block results-before)
|
|
|
|
(should (progn (org-babel-execute-src-block)
|
|
|
|
(sleep-for 0 200)
|
|
|
|
(string= (concat src-block results-after)
|
|
|
|
(buffer-string)))))))
|
2021-05-18 11:45:05 -04:00
|
|
|
|
|
|
|
(ert-deftest test-ob-python/async-output-drawer ()
|
2022-11-16 03:31:40 -05:00
|
|
|
;; Disable the test on older Emacs as built-in python.el sometimes
|
|
|
|
;; fail to initialize session.
|
|
|
|
(skip-unless (version<= "28" emacs-version))
|
2021-05-18 11:45:05 -04:00
|
|
|
(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
|
2022-11-16 03:31:40 -05:00
|
|
|
src-block
|
|
|
|
(should (progn (org-babel-execute-src-block)
|
|
|
|
(sleep-for 0 200)
|
|
|
|
(string= (concat src-block result)
|
|
|
|
(buffer-string)))))))
|
2021-05-18 11:45:05 -04:00
|
|
|
|
2023-07-12 06:07:06 -04:00
|
|
|
(ert-deftest test-ob-python/async-local-python-shell ()
|
|
|
|
;; Disable the test on older Emacs as built-in python.el sometimes
|
|
|
|
;; fail to initialize session.
|
|
|
|
(skip-unless (version<= "28" emacs-version))
|
|
|
|
(when-let ((buf (get-buffer "*Python*")))
|
|
|
|
(let (kill-buffer-query-functions)
|
|
|
|
(kill-buffer buf)))
|
|
|
|
(org-test-with-temp-text-in-file
|
|
|
|
"# -*- python-shell-buffer-name: \"Python 3\" -*-
|
|
|
|
<point>#+begin_src python :session \"*Python 3*\" :async yes
|
|
|
|
1
|
|
|
|
#+end_src"
|
|
|
|
(should (org-babel-execute-src-block))))
|
|
|
|
|
2023-08-31 00:45:13 -04:00
|
|
|
(ert-deftest test-ob-python/session-restart ()
|
|
|
|
;; Disable the test on older Emacs as built-in python.el sometimes
|
|
|
|
;; fail to initialize session.
|
|
|
|
(skip-unless (version<= "28" emacs-version))
|
|
|
|
(should
|
|
|
|
(equal "success"
|
|
|
|
(progn
|
|
|
|
(org-test-with-temp-text "#+begin_src python :session :results output
|
|
|
|
print('start')
|
|
|
|
#+end_src"
|
|
|
|
(org-babel-execute-src-block))
|
|
|
|
(let ((proc (python-shell-get-process)))
|
|
|
|
(python-shell-send-string "exit()")
|
|
|
|
(while (accept-process-output proc)))
|
|
|
|
(org-test-with-temp-text "#+begin_src python :session :results output
|
|
|
|
print('success')
|
|
|
|
#+end_src"
|
|
|
|
(org-babel-execute-src-block))))))
|
|
|
|
|
2011-11-28 03:55:28 -05:00
|
|
|
(provide 'test-ob-python)
|
|
|
|
|
|
|
|
;;; test-ob-python.el ends here
|