2011-11-28 08:55:28 +00:00
|
|
|
;;; test-ob-python.el --- tests for ob-python.el
|
|
|
|
|
2019-01-01 10:50:56 +00:00
|
|
|
;; Copyright (c) 2011-2014, 2019 Eric Schulte
|
2011-11-28 08:55:28 +00:00
|
|
|
;; Authors: Eric Schulte
|
|
|
|
|
2012-12-13 16:24:19 +00: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
|
|
|
|
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
|
2011-11-28 08:55:28 +00:00
|
|
|
|
2012-03-19 20:38:12 +00:00
|
|
|
;;; Code:
|
2011-11-28 08:55:28 +00:00
|
|
|
(org-test-for-executable "python")
|
2012-03-19 20:38:12 +00:00
|
|
|
(unless (featurep 'ob-python)
|
|
|
|
(signal 'missing-test-dependency "Support for Python code blocks"))
|
2011-11-28 08:55:28 +00:00
|
|
|
|
|
|
|
(ert-deftest test-ob-python/colnames-yes-header-argument ()
|
2019-12-22 13:51:57 +00:00
|
|
|
(should
|
|
|
|
(equal '(("col") hline ("a") ("b"))
|
|
|
|
(org-test-with-temp-text "#+name: eg
|
2011-11-28 08:55:28 +00:00
|
|
|
| col |
|
|
|
|
|-----|
|
|
|
|
| a |
|
|
|
|
| b |
|
|
|
|
|
|
|
|
#+header: :colnames yes
|
|
|
|
#+header: :var x = eg
|
2019-12-22 13:51:57 +00:00
|
|
|
<point>#+begin_src python
|
2011-11-28 08:55:28 +00:00
|
|
|
return x
|
|
|
|
#+end_src"
|
2019-12-22 13:51:57 +00:00
|
|
|
(org-babel-execute-src-block)))))
|
2011-11-28 08:55:28 +00:00
|
|
|
|
|
|
|
(ert-deftest test-ob-python/colnames-yes-header-argument-again ()
|
2019-12-22 13:51:57 +00:00
|
|
|
(should
|
|
|
|
(equal '(("a") hline ("b*") ("c*"))
|
|
|
|
(org-test-with-temp-text "#+name: less-cols
|
2011-11-28 08:55:28 +00:00
|
|
|
| a |
|
|
|
|
|---|
|
|
|
|
| b |
|
|
|
|
| c |
|
|
|
|
|
|
|
|
#+header: :colnames yes
|
2019-12-22 13:51:57 +00:00
|
|
|
<point>#+begin_src python :var tab=less-cols
|
2011-11-28 08:55:28 +00:00
|
|
|
return [[val + '*' for val in row] for row in tab]
|
|
|
|
#+end_src"
|
2019-12-22 13:51:57 +00:00
|
|
|
(org-babel-execute-src-block)))))
|
2011-11-28 08:55:28 +00:00
|
|
|
|
|
|
|
(ert-deftest test-ob-python/colnames-nil-header-argument ()
|
2019-12-22 13:51:57 +00:00
|
|
|
(should
|
|
|
|
(equal '(("col") hline ("a") ("b"))
|
|
|
|
(org-test-with-temp-text "#+name: eg
|
2011-11-28 08:55:28 +00:00
|
|
|
| col |
|
|
|
|
|-----|
|
|
|
|
| a |
|
|
|
|
| b |
|
|
|
|
|
|
|
|
#+header: :colnames nil
|
|
|
|
#+header: :var x = eg
|
2019-12-22 13:51:57 +00:00
|
|
|
<point>#+begin_src python
|
2011-11-28 08:55:28 +00:00
|
|
|
return x
|
|
|
|
#+end_src"
|
2019-12-22 13:51:57 +00:00
|
|
|
(org-babel-execute-src-block)))))
|
2011-11-28 08:55:28 +00:00
|
|
|
|
|
|
|
(ert-deftest test-ob-python/colnames-no-header-argument-again ()
|
2019-12-22 13:51:57 +00:00
|
|
|
(should
|
|
|
|
(equal '(("a*") ("b*") ("c*"))
|
|
|
|
(org-test-with-temp-text "#+name: less-cols
|
2011-11-28 08:55:28 +00:00
|
|
|
| a |
|
|
|
|
|---|
|
|
|
|
| b |
|
|
|
|
| c |
|
|
|
|
|
|
|
|
#+header: :colnames no
|
2019-12-22 13:51:57 +00:00
|
|
|
<point>#+begin_src python :var tab=less-cols
|
2011-11-28 08:55:28 +00:00
|
|
|
return [[val + '*' for val in row] for row in tab]
|
|
|
|
#+end_src"
|
2019-12-22 13:51:57 +00:00
|
|
|
(org-babel-execute-src-block)))))
|
2011-11-28 08:55:28 +00:00
|
|
|
|
|
|
|
(ert-deftest test-ob-python/colnames-no-header-argument ()
|
2019-12-22 13:51:57 +00:00
|
|
|
(should
|
|
|
|
(equal '(("col") ("a") ("b"))
|
|
|
|
(org-test-with-temp-text "#+name: eg
|
2011-11-28 08:55:28 +00:00
|
|
|
| col |
|
|
|
|
|-----|
|
|
|
|
| a |
|
|
|
|
| b |
|
|
|
|
|
|
|
|
#+header: :colnames no
|
|
|
|
#+header: :var x = eg
|
2019-12-22 13:51:57 +00:00
|
|
|
<point>#+begin_src python
|
2011-11-28 08:55:28 +00:00
|
|
|
return x
|
|
|
|
#+end_src"
|
2019-12-22 13:51:57 +00:00
|
|
|
(org-babel-execute-src-block)))))
|
2011-11-28 08:55:28 +00:00
|
|
|
|
2017-12-02 09:03:00 +00:00
|
|
|
(ert-deftest test-ob-python/session-multiline ()
|
|
|
|
;; FIXME workaround to prevent starting prompt leaking into output
|
|
|
|
(run-python)
|
|
|
|
(sleep-for 0 10)
|
2019-12-22 13:51:57 +00:00
|
|
|
(should
|
|
|
|
(equal "20"
|
|
|
|
(org-test-with-temp-text "#+begin_src python :session :results output
|
2017-12-02 09:03:00 +00:00
|
|
|
foo = 0
|
|
|
|
for _ in range(10):
|
|
|
|
foo += 1
|
|
|
|
|
|
|
|
foo += 1
|
|
|
|
|
|
|
|
print(foo)
|
|
|
|
#+end_src"
|
2019-12-22 13:51:57 +00:00
|
|
|
(org-babel-execute-src-block)))))
|
2017-12-02 09:03:00 +00:00
|
|
|
|
2018-04-01 08:34:32 +00:00
|
|
|
(ert-deftest test-ob-python/insert-necessary-blank-line-when-sending-code-to-interpreter ()
|
2019-12-22 13:51:57 +00:00
|
|
|
(should
|
|
|
|
(equal 2 (org-test-with-temp-text "#+begin_src python :session :results value
|
2018-04-01 08:34:32 +00:00
|
|
|
if True:
|
|
|
|
1
|
|
|
|
2
|
|
|
|
#+end_src"
|
2019-12-22 13:51:57 +00: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 08:34:32 +00: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-21 01:40:22 +00:00
|
|
|
(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)))))
|
|
|
|
|
2020-05-24 15:14:03 +00: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)))))
|
|
|
|
|
2011-11-28 08:55:28 +00:00
|
|
|
(provide 'test-ob-python)
|
|
|
|
|
|
|
|
;;; test-ob-python.el ends here
|