* 63 failures for org-test-run-all-tests in an Emacs GUI
@ 2014-12-22 15:45 Sebastien Vauban
2014-12-24 9:53 ` Nicolas Goaziou
0 siblings, 1 reply; 22+ messages in thread
From: Sebastien Vauban @ 2014-12-22 15:45 UTC (permalink / raw)
To: emacs-orgmode-mXXj517/zsQ
Hello,
I just ran `org-test-run-all-tests' in my active WinNT Emacs session
(with Org-mode release_8.3beta-677-g0497e3), and was surprised by the
high number of failures:
--8<---------------cut here---------------start------------->8---
Selector: "\\(org\\|ob\\)"
Passed: 332
Failed: 63 (53 unexpected)
Skipped: 0
Total: 395/395
Started at: 2014-12-22 16:34:06+0100
Finished.
Finished at: 2014-12-22 16:34:42+0100
....FFF.............FF........F...ffffffffff..F................F.F.F.FF......FF..FFFFFFFF.....F.F.F........FFFFFFFFF...F..F.F...F.....................................................F...............F..........................F.......................................F........FFF............................................................F..........F..........F...........F.FFFF..................
F ob-emacs-lisp/commented-last-block-line
(user-error "C-c C-c can do nothing useful at this location")
F ob-emacs-lisp/commented-last-block-line-no-var
(user-error "C-c C-c can do nothing useful at this location")
F ob-emacs-lisp/commented-last-block-line-with-var
(user-error "C-c C-c can do nothing useful at this location")
F ob-exp/noweb-on-export
Noweb header arguments export correctly.
(ert-test-failed
((should
(equal
'("(message \"expanded1\")" "(message \"expanded2\")" ";; noweb-1-yes-start\n (message \"expanded1\")\n (message \"expanded1\")" ";; noweb-no-start\n <<noweb-example1>>" ";; noweb-2-yes-start\n (message \"expanded2\")\n (message \"expanded2\")" ";; noweb-tangle-start\n<<noweb-example1>>\n<<noweb-example2>>")
(org-test-at-id "eb1f6498-5bd9-45e0-9c56-50717053e7b7"
(org-narrow-to-subtree)
(org-element-map ... ... ...))))
:form
(equal
("(message \"expanded1\")" "(message \"expanded2\")" ";; noweb-1-yes-start\n (message \"expanded1\")\n (message \"expanded1\")" ";; noweb-no-start\n <<noweb-example1>>" ";; noweb-2-yes-start\n (message \"expanded2\")\n (message \"expanded2\")" ";; noweb-tangle-start\n<<noweb-example1>>\n<<noweb-example2>>")
("(message \"expanded1\")" "(message \"expanded2\")" ";; noweb-1-yes-start\n (message \"expanded1\")\n (message \"expanded1\")" ";; noweb-no-start\n <<noweb-example1>>" ";; noweb-2-yes-start\n (message \"expanded2\")\n (message \"expanded2\")" ";; noweb-tangle-start\n <<noweb-example1>>\n <<noweb-example2>>"))
:value nil :explanation
(list-elt 2
(arrays-of-different-length 68 72 ";; noweb-1-yes-start\n (message \"expanded1\")\n (message \"expanded1\")" ";; noweb-1-yes-start\n (message \"expanded1\")\n (message \"expanded1\")" first-mismatch-at 23))))
F ob-exp/noweb-on-export-with-exports-results
Noweb header arguments export correctly using :exports results.
(error "<<noweb-example>>could not be resolved (see `org-babel-noweb-error-langs')")
F ob-tangle/continued-code-blocks-w-noweb-ref
Test that the :noweb-ref header argument is used correctly.
(ert-test-failed
((should
(re-search-forward
(regexp-quote tangled)
nil t))
:form
(re-search-forward "df|sed '1d'|awk '{print \\$5 \" \" \\$6}'|sort -n |tail -1|awk '{print \\$2}'" nil t)
:value nil))
F test-ob-exp/org-babel-exp-src-blocks/w-no-headers2
Testing export without any headlines in the org-mode file.
(user-error "Abort")
F test-ob-python/colnames-no-header-argument-again
(ert-test-failed
((should
(equal
'(... ... ...)
(org-babel-execute-src-block)))
:form
(equal
(("a*")
("b*")
("c*"))
"")
:value nil :explanation
(different-types
(("a*")
("b*")
("c*"))
"")))
F test-ob-python/colnames-yes-header-argument-again
(ert-test-failed
((should
(equal
'(... hline ... ...)
(org-babel-execute-src-block)))
:form
(equal
(("a")
hline
("b*")
("c*"))
"")
:value nil :explanation
(different-types
(("a")
hline
("b*")
("c*"))
"")))
F test-ob/blocks-with-spaces
Test expansion of blocks followed by blank lines.
(ert-test-failed
((should
(equal "#+BEGIN_SRC emacs-lisp\n(+ 1 2)\n#+END_SRC\n\n#+RESULTS:\n: 3\n\n\n"
(org-test-with-temp-text "#+BEGIN_SRC emacs-lisp\n(+ 1 2)\n#+END_SRC\n\n\n"
(org-babel-execute-src-block)
(buffer-string))))
:form
(equal "#+BEGIN_SRC emacs-lisp\n(+ 1 2)\n#+END_SRC\n\n#+RESULTS:\n: 3\n\n\n" "#+BEGIN_SRC emacs-lisp\n(+ 1 2)\n#+END_SRC\n\n#+results:\n: 3\n\n\n")
:value nil :explanation
(array-elt 44
(different-atoms
(82 "#x52" "?R")
(114 "#x72" "?r")))))
F test-ob/commented-last-block-line-no-var
(user-error "C-c C-c can do nothing useful at this location")
F test-ob/commented-last-block-line-with-var
(user-error "C-c C-c can do nothing useful at this location")
F test-ob/noweb-expansion-1
(ert-test-failed
((should
(string=
(org-babel-expand-noweb-references)
"bar"))
:form
(string= " bar" "bar")
:value nil))
F test-ob/noweb-expansion-2
(ert-test-failed
((should
(string=
(org-babel-expand-noweb-references)
"barbaz"))
:form
(string= " bar baz" "barbaz")
:value nil))
F test-ob/org-babel-remove-result--results-code
Test `org-babel-remove-result' with :results code.
(user-error "C-c C-c can do nothing useful at this location")
F test-ob/org-babel-remove-result--results-default
Test `org-babel-remove-result' with default :results.
(user-error "C-c C-c can do nothing useful at this location")
F test-ob/org-babel-remove-result--results-html
Test `org-babel-remove-result' with :results html.
(user-error "C-c C-c can do nothing useful at this location")
F test-ob/org-babel-remove-result--results-latex
Test `org-babel-remove-result' with :results latex.
(user-error "C-c C-c can do nothing useful at this location")
F test-ob/org-babel-remove-result--results-list
Test `org-babel-remove-result' with :results list.
(user-error "C-c C-c can do nothing useful at this location")
F test-ob/org-babel-remove-result--results-org
Test `org-babel-remove-result' with :results org.
(user-error "C-c C-c can do nothing useful at this location")
F test-ob/org-babel-remove-result--results-pp
Test `org-babel-remove-result' with :results pp.
(user-error "C-c C-c can do nothing useful at this location")
F test-ob/org-babel-remove-result--results-wrap
Test `org-babel-remove-result' with :results wrap.
(user-error "C-c C-c can do nothing useful at this location")
F test-ob/results-in-narrowed-buffer
Test block execution in a narrowed buffer.
(ert-test-failed
((should
(equal "#+BEGIN_SRC emacs-lisp\n(+ 1 2)\n#+END_SRC\n\n#+RESULTS:\n: 3"
(org-test-with-temp-text "#+BEGIN_SRC emacs-lisp\n(+ 1 2)\n#+END_SRC\n\nParagraph"
(narrow-to-region ... ...)
(org-babel-execute-src-block)
(org-trim ...))))
:form
(equal "#+BEGIN_SRC emacs-lisp\n(+ 1 2)\n#+END_SRC\n\n#+RESULTS:\n: 3" "#+BEGIN_SRC emacs-lisp\n(+ 1 2)\n#+END_SRC\n\n#+results:\n: 3")
:value nil :explanation
(array-elt 44
(different-atoms
(82 "#x52" "?R")
(114 "#x72" "?r")))))
F test-ob/specific-colnames
Test passing specific column names.
(ert-test-failed
((should
(equal "#+name: input-table\n| id | var1 |\n|----+------|\n| 1 | bar |\n| 2 | baz |\n\n#+begin_src sh :var data=input-table :exports results :colnames '(Rev Author)\necho \"$data\"\n#+end_src\n\n#+RESULTS:\n| Rev | Author |\n|-----+--------|\n| 1 | bar |\n| 2 | baz |\n\n"
(org-test-with-temp-text "#+name: input-table\n| id | var1 |\n|----+------|\n| 1 | bar |\n| 2 | baz |\n\n#+begin_src sh :var data=input-table :exports results :colnames '(Rev Author)\necho \"$data\"\n#+end_src\n"
(should ...)
(goto-char ...)
(org-babel-execute-src-block)
(buffer-string))))
:form
(equal "#+name: input-table\n| id | var1 |\n|----+------|\n| 1 | bar |\n| 2 | baz |\n\n#+begin_src sh :var data=input-table :exports results :colnames '(Rev Author)\necho \"$data\"\n#+end_src\n\n#+RESULTS:\n| Rev | Author |\n|-----+--------|\n| 1 | bar |\n| 2 | baz |\n\n" "#+name: input-table\n| id | var1 |\n|----+------|\n| 1 | bar |\n| 2 | baz |\n\n#+begin_src sh :var data=input-table :exports results :colnames '(Rev Author)\necho \"$data\"\n#+end_src\n\n#+results:\n| Rev | Author |\n|-----+--------|\n| 1 | bar |\n| 2 | baz |\n\n")
:value nil :explanation
(array-elt 181
(different-atoms
(82 "#x52" "?R")
(114 "#x72" "?r")))))
F test-org-babel/combining-scalar-and-raw-result-types
(error "Unknown language `sh' at position 3 in `org-test4792BBx'")
F test-org-babel/inline-src_blk-default-results-replace-line-1
(user-error "C-c C-c can do nothing useful at this location")
F test-org-babel/inline-src_blk-default-results-replace-line-2
(user-error "C-c C-c can do nothing useful at this location")
F test-org-babel/inline-src_blk-manual-results-replace
(user-error "C-c C-c can do nothing useful at this location")
F test-org-babel/inline-src_blk-preceded-punct-preceded-by-point
(user-error "C-c C-c can do nothing useful at this location")
F test-org-babel/inline-src_blk-results-file
(user-error "C-c C-c can do nothing useful at this location")
F test-org-babel/inline-src_blk-results-raw
(user-error "C-c C-c can do nothing useful at this location")
F test-org-babel/inline-src_blk-results-scalar
(user-error "C-c C-c can do nothing useful at this location")
F test-org-babel/inline-src_blk-results-silent
(user-error "C-c C-c can do nothing useful at this location")
F test-org-babel/inline-src_blk-results-verbatim
(user-error "C-c C-c can do nothing useful at this location")
F test-org-babel/nested-code-block
Test nested code blocks inside code blocks don't cause problems.
(ert-test-failed
((should
(string=
(org-babel-execute-src-block)
"#+begin_src emacs-lisp\n 'foo\n#+end_src"))
:form
(string= " #+begin_src emacs-lisp\n , 'foo\n #+end_src" "#+begin_src emacs-lisp\n 'foo\n#+end_src")
:value nil))
F test-org-babel/parse-header-args
(error "Unknown language `example-lang' at position 3 in `org-test47921MO'")
F test-org-babel/partial-nested-code-block
Test nested code blocks inside code blocks don't cause problems.
(ert-test-failed
((should
(string= "#+begin_src emacs-lisp"
(org-babel-execute-src-block)))
:form
(string= "#+begin_src emacs-lisp" " #+begin_src emacs-lisp")
:value nil))
F test-org-clock/clocktable
Test clocktable specifications.
(ert-test-failed
((should
(equal "| Headline | Time | |\n|------------------------------+---------+-------|\n| *Total time* | *16:00* | |\n|------------------------------+---------+-------|\n| Relative times in clocktable | 16:00 | |\n| Foo | | 5:00 |\n| Bar | | 11:00 |\n"
(org-test-with-temp-text "* Relative times in clocktable\n** Foo\n** Bar\n"
(progn ... ... ... ... ... ... ... ... ... ...))))
:form
(equal "| Headline | Time | |\n|------------------------------+---------+-------|\n| *Total time* | *16:00* | |\n|------------------------------+---------+-------|\n| Relative times in clocktable | 16:00 | |\n| Foo | | 5:00 |\n| Bar | | 11:00 |\n"
#("| Headline | Time | |\n|------------------------------+-------+-------|\n| Total time | 16:00 | |\n|------------------------------+-------+-------|\n| Relative times in clocktable | 16:00 | |\n| Foo | | 5:00 |\n| Bar | | 11:00 |\n" 198 226
(:org-clock-minutes 960)
247 250
(:org-clock-minutes 300)
296 299
(:org-clock-minutes 660)))
:value nil :explanation
(arrays-of-different-length 357 343 "| Headline | Time | |\n|------------------------------+---------+-------|\n| *Total time* | *16:00* | |\n|------------------------------+---------+-------|\n| Relative times in clocktable | 16:00 | |\n| Foo | | 5:00 |\n| Bar | | 11:00 |\n"
#("| Headline | Time | |\n|------------------------------+-------+-------|\n| Total time | 16:00 | |\n|------------------------------+-------+-------|\n| Relative times in clocktable | 16:00 | |\n| Foo | | 5:00 |\n| Bar | | 11:00 |\n" 198 226
(:org-clock-minutes 960)
247 250
(:org-clock-minutes 300)
296 299
(:org-clock-minutes 660))
first-mismatch-at 33)))
F test-org-element/inlinetask-parser
Test `inlinetask' parser.
(ert-test-failed
((should
(org-test-with-temp-text "\n*************** Task\nDEADLINE: <2012-03-29 thu.>"
(forward-line)
(org-element-property :deadline
(org-element-at-point))))
:form
(let
((inside-text
(if ... "\n*************** Task\nDEADLINE: <2012-03-29 thu.>" ...)))
(with-temp-buffer
(org-mode)
(let
(...)
(if point ... ... ...))
(forward-line)
(org-element-property :deadline
(org-element-at-point))))
:value nil))
F test-org-element/link-parser
Test `link' parser.
(ert-test-failed
((should
(equal
'("file" "projects.org" "docview")
(org-test-with-temp-text "[[docview:projects.org]]"
(let ... ...))))
:form
(equal
("file" "projects.org" "docview")
("fuzzy" "docview:projects.org" nil))
:value nil :explanation
(list-elt 0
(arrays-of-different-length 4 5 "file" "fuzzy" first-mismatch-at 1))))
F test-org-element/src-block-interpreter
Test src block interpreter.
(ert-test-failed
((should
(equal
(let
(...)
(org-test-parse-and-interpret "#+BEGIN_SRC emacs-lisp :results silent\n(+ 1 1)\n#+END_SRC"))
"#+BEGIN_SRC emacs-lisp :results silent\n (+ 1 1)\n#+END_SRC\n"))
:form
(equal "#+BEGIN_SRC emacs-lisp :results silent\n(+ 1 1)\n#+END_SRC\n" "#+BEGIN_SRC emacs-lisp :results silent\n (+ 1 1)\n#+END_SRC\n")
:value nil :explanation
(arrays-of-different-length 57 59 "#+BEGIN_SRC emacs-lisp :results silent\n(+ 1 1)\n#+END_SRC\n" "#+BEGIN_SRC emacs-lisp :results silent\n (+ 1 1)\n#+END_SRC\n" first-mismatch-at 39)))
F test-org-list/to-html
Test `org-list-to-html' specifications.
(ert-test-failed
((should
(equal "<ul class=\"org-ul\">\n<li>a</li>\n</ul>"
(let
(org-html-indent)
(with-temp-buffer ... ... ... ... ... ... ...))))
:form
(equal "<ul class=\"org-ul\">\n<li>a</li>\n</ul>" "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"\n \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta name=\"generator\" content=\n \"HTML Tidy for Cygwin (vers 1st September 2004), see www.w3.org\" />\n\n <title></title>\n</head>\n\n<body>\n <ul class=\"org-ul\">\n <li>a</li>\n </ul>\n</body>\n</html>")
:value nil :explanation
(arrays-of-different-length 36 365 "<ul class=\"org-ul\">\n<li>a</li>\n</ul>" "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"\n \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta name=\"generator\" content=\n \"HTML Tidy for Cygwin (vers 1st September 2004), see www.w3.org\" />\n\n <title></title>\n</head>\n\n<body>\n <ul class=\"org-ul\">\n <li>a</li>\n </ul>\n</body>\n</html>" first-mismatch-at 1)))
F test-org-src/basic
Editing regular block works. with point on
(ert-test-failed
((should
(equal
(buffer-string)
"\n#+begin_src emacs-lisp\n blah(message hello)\n#+end_src\n"))
:form
(equal
#("\n#+begin_src emacs-lisp\nblah (message hello)\n#+end_src\n" 24 28
(fontified nil)
28 46
(fontified nil))
"\n#+begin_src emacs-lisp\n blah(message hello)\n#+end_src\n")
:value nil :explanation
(array-elt 24
(different-atoms
(98 "#x62" "?b")
(32 "#x20" "? ")))))
F test-org-src/blank-line-block
Editing block with just a blank line.
(ert-test-failed
((should
(equal
(buffer-string)
"\n#+begin_src emacs-lisp\n blah\n#+end_src\n"))
:form
(equal
#("\n#+begin_src emacs-lisp\nblah\n#+end_src\n" 0 24
(org-category "org-test47922_s" fontified nil)
24 28
(fontified nil)
28 29
(fontified nil)
29 39
(org-category "org-test47922_s" fontified nil))
"\n#+begin_src emacs-lisp\n blah\n#+end_src\n")
:value nil :explanation
(arrays-of-different-length 39 41
#("\n#+begin_src emacs-lisp\nblah\n#+end_src\n" 0 24
(org-category "org-test47922_s" fontified nil)
24 28
(fontified nil)
28 29
(fontified nil)
29 39
(org-category "org-test47922_s" fontified nil))
"\n#+begin_src emacs-lisp\n blah\n#+end_src\n" first-mismatch-at 24)))
F test-org-src/empty-block
Editing empty block.
(ert-test-failed
((should
(equal
(buffer-string)
"\n#+begin_src emacs-lisp\n blah\n#+end_src\n"))
:form
(equal
#("\n#+begin_src emacs-lisp\nblah\n#+end_src\n" 24 28
(fontified nil))
"\n#+begin_src emacs-lisp\n blah\n#+end_src\n")
:value nil :explanation
(arrays-of-different-length 39 41
#("\n#+begin_src emacs-lisp\nblah\n#+end_src\n" 24 28
(fontified nil))
"\n#+begin_src emacs-lisp\n blah\n#+end_src\n" first-mismatch-at 24)))
F test-org/comment-dwim
Test `comment-dwim' behaviour in an Org buffer.
(ert-test-failed
((should
(equal "# \nComment"
(org-test-with-temp-text "Comment"
(progn ... ...))))
:form
(equal "# \nComment" "# Comment")
:value nil :explanation
(arrays-of-different-length 10 9 "# \nComment" "# Comment" first-mismatch-at 2)))
F test-org/entry-put
Test `org-entry-put' specifications.
(ert-test-failed
((should
(string= "* H\n"
(org-test-with-temp-text "* H\nDEADLINE: <2014-03-04 tue.>"
(org-entry-put ... "DEADLINE" nil)
(buffer-string))))
:form
(string= "* H\n" "* H\n:LOGBOOK:\n:END:\n")
:value nil))
F test-org/insert-heading
Test `org-insert-heading' specifications.
(ert-test-failed
((should
(equal "* H\n- item\n- item 2\n* "
(org-test-with-temp-text "* H\n- item<point>\n- item 2"
(let ... ...)
(buffer-string))))
:form
(equal "* H\n- item\n- item 2\n* " "* H\n- item\n- item 2\n\n* ")
:value nil :explanation
(arrays-of-different-length 22 23 "* H\n- item\n- item 2\n* " "* H\n- item\n- item 2\n\n* " first-mismatch-at 20)))
F test-org/org-link-escape-ascii-ctrl-character
Escape an ascii control character.
(ert-test-failed
((should
(string= "%09"
(org-link-escape " ")))
:form
(string= "%09" " ")
:value nil))
F test-org/org-link-escape-custom-table
Escape string with custom character table.
(ert-test-failed
((should
(string= "Foo%3A%42ar%0A"
(org-link-escape "Foo:Bar\n" '...)))
:form
(string= "Foo%3A%42ar%0A" "Foo%3A%42ar\n")
:value nil))
F test-org/org-link-escape-custom-table-merge
Escape string with custom table merged with default table.
(ert-test-failed
((should
(string= "%5BF%6F%6F%3A%42ar%0A%5D"
(org-link-escape "[Foo:Bar\n]" '... t)))
:form
(string= "%5BF%6F%6F%3A%42ar%0A%5D" "%5BF%6F%6F%3A%42ar\n%5D")
:value nil))
F test-org/org-link-escape-multibyte-character
Escape an unicode multibyte character.
(ert-test-failed
((should
(string= "%E2%82%AC"
(org-link-escape "€")))
:form
(string= "%E2%82%AC" "€")
:value nil))
F test-org/org-link-escape-url-with-escaped-char
Escape and unescape a URL that includes an escaped char.
(ert-test-failed
((should
(string= "http://some.host.com/form?&id=blah%2Bblah25"
(org-link-unescape
(org-link-escape "http://some.host.com/form?&id=blah%2Bblah25"))))
:form
(string= "http://some.host.com/form?&id=blah%2Bblah25" "http://some.host.com/form?&id=blah+blah25")
:value nil))
--8<---------------cut here---------------end--------------->8---
Note that the Python failures must be dismissed as I don't have any
Python executable on my machine [1]. But it's unclear for me why the other
errors are occurring now.
Something that also suprises me is that, last week, I had 460+ tests
ran, in (what I take as) the same conditions!?
Best regards,
Seb
[1] I've put python as an Org Babel language to pass Nicolas' Org
languages test in all my files -- I do have some Python code blocks
for which I want to see the correct highlighting.
--
Sebastien Vauban
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: 63 failures for org-test-run-all-tests in an Emacs GUI
2014-12-22 15:45 63 failures for org-test-run-all-tests in an Emacs GUI Sebastien Vauban
@ 2014-12-24 9:53 ` Nicolas Goaziou
2014-12-24 10:33 ` Sebastien Vauban
2014-12-31 9:25 ` 63 failures for org-test-run-all-tests in an Emacs GUI Sebastien Vauban
0 siblings, 2 replies; 22+ messages in thread
From: Nicolas Goaziou @ 2014-12-24 9:53 UTC (permalink / raw)
To: Sebastien Vauban; +Cc: public-emacs-orgmode-mXXj517/zsQ
Hello,
Sebastien Vauban <sva-news-D0wtAvR13HarG/iDocfnWg@public.gmane.org>
writes:
> I just ran `org-test-run-all-tests' in my active WinNT Emacs session
> (with Org-mode release_8.3beta-677-g0497e3), and was surprised by the
> high number of failures:
You probably heavily customized Org, and many tests expect default
values for defcustoms to run properly.
I fixed the most obvious one, but there is more work to do in that area.
Regards,
--
Nicolas Goaziou
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: 63 failures for org-test-run-all-tests in an Emacs GUI
2014-12-24 9:53 ` Nicolas Goaziou
@ 2014-12-24 10:33 ` Sebastien Vauban
2014-12-24 12:39 ` Sebastien Vauban
2014-12-31 9:25 ` 63 failures for org-test-run-all-tests in an Emacs GUI Sebastien Vauban
1 sibling, 1 reply; 22+ messages in thread
From: Sebastien Vauban @ 2014-12-24 10:33 UTC (permalink / raw)
To: emacs-orgmode-mXXj517/zsQ
Hello,
Nicolas Goaziou wrote:
> Sebastien Vauban writes:
>
>> I just ran `org-test-run-all-tests' in my active WinNT Emacs session
>> (with Org-mode release_8.3beta-677-g0497e3), and was surprised by the
>> high number of failures:
>
> You probably heavily customized Org
For sure ;-)
> and many tests expect default values for defcustoms to run properly.
>
> I fixed the most obvious one, but there is more work to do in that area.
IIUC, the "top 1" problem for test failures is my customization of
`org-babel-no-eval-on-ctrl-c-ctrl-c' to `t'.
For the tests to work with that (common?) customization, should we
replace, in the tests, all calls to:
--8<---------------cut here---------------start------------->8---
(org-ctrl-c-ctrl-c)
--8<---------------cut here---------------end--------------->8---
by:
--8<---------------cut here---------------start------------->8---
(let (org-babel-no-eval-on-ctrl-c-ctrl-c)
(org-ctrl-c-ctrl-c))
--8<---------------cut here---------------end--------------->8---
?
Best regards,
Seb
--
Sebastien Vauban
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: 63 failures for org-test-run-all-tests in an Emacs GUI
2014-12-24 10:33 ` Sebastien Vauban
@ 2014-12-24 12:39 ` Sebastien Vauban
2014-12-24 16:14 ` Nicolas Goaziou
0 siblings, 1 reply; 22+ messages in thread
From: Sebastien Vauban @ 2014-12-24 12:39 UTC (permalink / raw)
To: emacs-orgmode-mXXj517/zsQ
Sebastien Vauban wrote:
> Nicolas Goaziou wrote:
>> Sebastien Vauban writes:
>>
>>> I just ran `org-test-run-all-tests' in my active WinNT Emacs session
>>> (with Org-mode release_8.3beta-677-g0497e3), and was surprised by
>>> the high number of failures:
>>
>> You probably heavily customized Org
>
> For sure ;-)
>
>> and many tests expect default values for defcustoms to run properly.
>>
>> I fixed the most obvious one, but there is more work to do in that
>> area.
>
> IIUC, the "top 1" problem for test failures is my customization of
> `org-babel-no-eval-on-ctrl-c-ctrl-c' to `t'.
>
> For the tests to work with that (common?) customization, should we
> replace, in the tests, all calls to:
>
> (org-ctrl-c-ctrl-c)
>
> by:
>
> (let (org-babel-no-eval-on-ctrl-c-ctrl-c)
> (org-ctrl-c-ctrl-c))
>
> ?
In fact, what would make more sense is to have
a `org-ctrl-c-ctrl-v-ctrl-e' function, no?
Or even more sense: calling `org-babel-execute-maybe' instead?
Best regards,
Seb
--
Sebastien Vauban
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: 63 failures for org-test-run-all-tests in an Emacs GUI
2014-12-24 12:39 ` Sebastien Vauban
@ 2014-12-24 16:14 ` Nicolas Goaziou
[not found] ` <87egrp2ffk.fsf-Gpy5sJQTEQHwkn9pgDnJRVAUjnlXr6A1@public.gmane.org>
0 siblings, 1 reply; 22+ messages in thread
From: Nicolas Goaziou @ 2014-12-24 16:14 UTC (permalink / raw)
To: Sebastien Vauban; +Cc: public-emacs-orgmode-mXXj517/zsQ
Sebastien Vauban <sva-news-D0wtAvR13HarG/iDocfnWg@public.gmane.org>
writes:
> Or even more sense: calling `org-babel-execute-maybe' instead?
I think it would be better, yes. There is no point in testing
`org-ctrl-c-ctrl-c' in "test-ob.el".
Regards,
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH] Replace `org-ctrl-c-ctrl-c' by `org-babel-execute-maybe' in tests
[not found] ` <87egrp2ffk.fsf-Gpy5sJQTEQHwkn9pgDnJRVAUjnlXr6A1@public.gmane.org>
@ 2014-12-29 16:06 ` Sebastien Vauban
2014-12-30 8:53 ` Nicolas Goaziou
0 siblings, 1 reply; 22+ messages in thread
From: Sebastien Vauban @ 2014-12-29 16:06 UTC (permalink / raw)
To: Nicolas Goaziou; +Cc: public-emacs-orgmode-mXXj517/zsQ-wOFGN7rlS/M9smdsby/KFg
Nicolas Goaziou wrote:
> Sebastien Vauban writes:
>
>> Or even more sense: calling `org-babel-execute-maybe' instead?
>
> I think it would be better, yes. There is no point in testing
> `org-ctrl-c-ctrl-c' in "test-ob.el".
Here's a patch doing so.
Best regards,
Seb
Subject: [PATCH] Replace `org-ctrl-c-ctrl-c' by `org-babel-execute-maybe' in tests
* test-ob-emacs-lisp.el, test-ob-ruby.el, test-ob.el: Use
`org-babel-execute-maybe' instead of `org-ctrl-c-ctrl-c'.
---
testing/lisp/test-ob-emacs-lisp.el | 10 ++---
testing/lisp/test-ob-ruby.el | 8 ++--
testing/lisp/test-ob.el | 88 +++++++++++++++++++-------------------
3 files changed, 53 insertions(+), 53 deletions(-)
diff --git a/testing/lisp/test-ob-emacs-lisp.el b/testing/lisp/test-ob-emacs-lisp.el
index f771ee3..bb3f51b 100644
--- a/testing/lisp/test-ob-emacs-lisp.el
+++ b/testing/lisp/test-ob-emacs-lisp.el
@@ -1,6 +1,6 @@
;;; test-ob-emacs-lisp.el
-;; Copyright (c) 2012, 2013, 2014 Free Software Foundation, Inc.
+;; Copyright (c) 2012-2014 Free Software Foundation, Inc.
;; Authors: Eric Schulte, Martyn Jago
;; This file is not part of GNU Emacs.
@@ -29,7 +29,7 @@
;;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (re-search-forward "results:" nil t))
(forward-line)
(should
@@ -42,7 +42,7 @@
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (re-search-forward "results:" nil t))
(forward-line)
(should
@@ -56,7 +56,7 @@
;;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(re-search-forward "results" nil t)
(forward-line)
(should (string=
@@ -69,7 +69,7 @@
2;;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(re-search-forward "results" nil t)
(forward-line)
(should (string=
diff --git a/testing/lisp/test-ob-ruby.el b/testing/lisp/test-ob-ruby.el
index ee7e837..28c06a4 100644
--- a/testing/lisp/test-ob-ruby.el
+++ b/testing/lisp/test-ob-ruby.el
@@ -1,6 +1,6 @@
;;; test-ob-ruby.el --- tests for ob-ruby.el
-;; Copyright (c) 2013 Oleh Krehel
+;; Copyright (c) 2013-2014 Oleh Krehel
;; Authors: Oleh Krehel
;; This program is free software; you can redistribute it and/or modify
@@ -28,7 +28,7 @@ s = \"2\"
s = \"3\"
puts s
#+end_src"
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(substring-no-properties
(buffer-string)))
"#+begin_src ruby :session :results output
@@ -47,7 +47,7 @@ puts s
s = \"5\"
puts s
#+end_src"
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(substring-no-properties
(buffer-string)))
"#+begin_src ruby :session :results output
@@ -63,7 +63,7 @@ puts s
(should (equal (org-test-with-temp-text "#+begin_src ruby :session :results output
puts s
#+end_src"
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(substring-no-properties
(buffer-string)))
"#+begin_src ruby :session :results output
diff --git a/testing/lisp/test-ob.el b/testing/lisp/test-ob.el
index efde99a..5b75e23 100644
--- a/testing/lisp/test-ob.el
+++ b/testing/lisp/test-ob.el
@@ -269,7 +269,7 @@ this is simple"
(ert-deftest test-org-babel/org-babel-get-inline-src-block-matches ()
(flet ((test-at-id (id)
- (org-test-at-id
+ (org-test-at-id
id
(let ((test-point (point)))
(should (fboundp 'org-babel-get-inline-src-block-matches))
@@ -298,18 +298,18 @@ this is simple"
;; src_ at bol line 1...
(org-test-with-temp-text
test-line
- (goto-char (point-min)) (org-ctrl-c-ctrl-c)
+ (goto-char (point-min)) (org-babel-execute-maybe)
(should (string=
(concat test-line " =1=")
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))
- (forward-char) (org-ctrl-c-ctrl-c)
+ (forward-char) (org-babel-execute-maybe)
(should (string=
(concat test-line " =1= =1=")
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))
(re-search-forward "1}")
- (should-error (org-ctrl-c-ctrl-c))
+ (should-error (org-babel-execute-maybe))
(backward-char) ;; last char of block body
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (string=
(concat test-line " =1= =1= =1=")
(buffer-substring-no-properties (point-at-bol) (point-at-eol)))))
@@ -317,29 +317,29 @@ this is simple"
(let ((test-line " src_emacs-lisp{ 1 }"))
(org-test-with-temp-text
test-line
- (should-error (org-ctrl-c-ctrl-c))
- (forward-char) (org-ctrl-c-ctrl-c)
+ (should-error (org-babel-execute-maybe))
+ (forward-char) (org-babel-execute-maybe)
(should (string=
(concat test-line " =1=")
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))
- (re-search-forward "{ 1 ") (org-ctrl-c-ctrl-c)
+ (re-search-forward "{ 1 ") (org-babel-execute-maybe)
(should (string=
(concat test-line " =1= =1=")
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))
(forward-char)
- (should-error (org-ctrl-c-ctrl-c))))))
+ (should-error (org-babel-execute-maybe))))))
(ert-deftest test-org-babel/inline-src_blk-default-results-replace-line-2 ()
;; src_ at bol line 2...
(let ((test-line " src_emacs-lisp{ \"x\" }"))
(org-test-with-temp-text
(concat "\n" test-line)
- (should-error (org-ctrl-c-ctrl-c))
+ (should-error (org-babel-execute-maybe))
(goto-char (point-min))
- (should-error (org-ctrl-c-ctrl-c))
+ (should-error (org-babel-execute-maybe))
(forward-line)
- (should-error (org-ctrl-c-ctrl-c))
- (forward-char) (org-ctrl-c-ctrl-c)
+ (should-error (org-babel-execute-maybe))
+ (forward-char) (org-babel-execute-maybe)
(should (string=
(concat test-line " =x=")
(buffer-substring-no-properties
@@ -350,27 +350,27 @@ this is simple"
test-line
(goto-char (point-max))
(insert (concat "\n" test-line " end"))
- (re-search-backward "src") (org-ctrl-c-ctrl-c)
+ (re-search-backward "src") (org-babel-execute-maybe)
(should (string=
(concat test-line " =y= end")
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))
- (re-search-forward "\" ") (org-ctrl-c-ctrl-c)
+ (re-search-forward "\" ") (org-babel-execute-maybe)
(should (string=
(concat test-line " =y= =y= end")
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))
(forward-char)
- (should-error (org-ctrl-c-ctrl-c)))))
+ (should-error (org-babel-execute-maybe)))))
(ert-deftest test-org-babel/inline-src_blk-manual-results-replace ()
(let ((test-line " src_emacs-lisp[:results replace]{ \"x\" }"))
(org-test-with-temp-text
(concat "\n" test-line)
- (should-error (org-ctrl-c-ctrl-c))
+ (should-error (org-babel-execute-maybe))
(goto-char (point-max))
- (should-error (org-ctrl-c-ctrl-c))
+ (should-error (org-babel-execute-maybe))
(beginning-of-line)
- (should-error (org-ctrl-c-ctrl-c))
- (forward-char) (org-ctrl-c-ctrl-c)
+ (should-error (org-babel-execute-maybe))
+ (forward-char) (org-babel-execute-maybe)
(should (string=
(concat test-line " =x=")
(buffer-substring-no-properties
@@ -381,68 +381,68 @@ this is simple"
(org-test-with-temp-text test-line
(goto-char (point-max))
(insert (concat "\n" test-line " end"))
- (re-search-backward "src") (org-ctrl-c-ctrl-c)
+ (re-search-backward "src") (org-babel-execute-maybe)
(should (string=
(concat test-line " =y= end")
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))
- (re-search-forward "\" ") (org-ctrl-c-ctrl-c)
+ (re-search-forward "\" ") (org-babel-execute-maybe)
(should (string=
(concat test-line " =y= =y= end")
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))
(forward-char)
- (should-error (org-ctrl-c-ctrl-c)))))
+ (should-error (org-babel-execute-maybe)))))
(ert-deftest test-org-babel/inline-src_blk-results-silent ()
(let ((test-line "src_emacs-lisp[ :results silent ]{ \"x\" }"))
(org-test-with-temp-text test-line
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (string= test-line
(buffer-substring-no-properties
(point-at-bol) (point-at-eol))))
(end-of-buffer)
- (should-error (org-ctrl-c-ctrl-c))))
+ (should-error (org-babel-execute-maybe))))
(let ((test-line (concat " Some text prior to block src_emacs-lisp"
"[ :results silent ]{ \"y\" }")))
(org-test-with-temp-text
test-line
(goto-char (point-max))
(insert (concat "\n" test-line " end"))
- (re-search-backward "src_") (org-ctrl-c-ctrl-c)
+ (re-search-backward "src_") (org-babel-execute-maybe)
(should (string= (concat test-line " end")
(buffer-substring-no-properties
(point-at-bol) (point-at-eol))))
- (re-search-forward "\" ") (org-ctrl-c-ctrl-c)
+ (re-search-forward "\" ") (org-babel-execute-maybe)
(should (string= (concat test-line " end")
(buffer-substring-no-properties
(point-at-bol) (point-at-eol))))
(forward-char)
- (should-error (org-ctrl-c-ctrl-c)))))
+ (should-error (org-babel-execute-maybe)))))
(ert-deftest test-org-babel/inline-src_blk-results-raw ()
(let ((test-line "src_emacs-lisp[ :results raw ]{ \"x\" }"))
(org-test-with-temp-text test-line
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (string= (concat test-line " x")
(buffer-string)))))
(let ((test-line (concat " Some text prior to block "
"src_emacs-lisp[ :results raw ]{ \"the\" }")))
(org-test-with-temp-text (concat test-line " end")
- (re-search-forward "src_") (org-ctrl-c-ctrl-c)
+ (re-search-forward "src_") (org-babel-execute-maybe)
(should (string= (concat test-line " the end")
(buffer-substring-no-properties
(point-at-bol) (point-at-eol))))
- (re-search-forward "\" ") (org-ctrl-c-ctrl-c)
+ (re-search-forward "\" ") (org-babel-execute-maybe)
(should (string= (concat test-line " the the end")
(buffer-substring-no-properties
(point-at-bol) (point-at-eol))))
(forward-char)
- (should-error (org-ctrl-c-ctrl-c)))))
+ (should-error (org-babel-execute-maybe)))))
(ert-deftest test-org-babel/inline-src_blk-results-file ()
(let ((test-line "src_emacs-lisp[ :results file ]{ \"~/test-file\" }"))
(org-test-with-temp-text
test-line
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (string= (concat test-line " [[file:~/test-file]]")
(buffer-substring-no-properties
(point-min) (point-max)))))))
@@ -451,7 +451,7 @@ this is simple"
(let ((test-line "src_emacs-lisp[ :results scalar ]{ \"x\" }"))
(org-test-with-temp-text
test-line
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (string= (concat test-line " =\"x\"=")
(buffer-substring-no-properties
(point-min) (point-max)))))))
@@ -460,7 +460,7 @@ this is simple"
(let ((test-line "src_emacs-lisp[ :results verbatim ]{ \"x\" }"))
(org-test-with-temp-text
test-line
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (string= (concat test-line " =\"x\"=")
(buffer-substring-no-properties
(point-min) (point-max)))))))
@@ -710,7 +710,7 @@ on two lines
;;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (re-search-forward "\\#\\+results:" nil t))
(forward-line)
(should
@@ -722,7 +722,7 @@ on two lines
\"some text\";;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (re-search-forward "\\#\\+results:" nil t))
(forward-line)
(should
@@ -736,7 +736,7 @@ on two lines
;;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(re-search-forward "\\#\\+results:" nil t)
(forward-line)
(should (string=
@@ -747,7 +747,7 @@ on two lines
2;;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(re-search-forward "\\#\\+results:" nil t)
(forward-line)
(should (string=
@@ -763,7 +763,7 @@ The block is actually executed /twice/ to ensure result
replacement happens correctly."
(org-test-with-temp-text
buffer-text
- (org-babel-next-src-block) (org-ctrl-c-ctrl-c) (org-ctrl-c-ctrl-c)
+ (org-babel-next-src-block) (org-babel-execute-maybe) (org-babel-execute-maybe)
(should (re-search-forward "\\#\\+results:" nil t))
(forward-line)
(should (string= result
@@ -849,7 +849,7 @@ trying to find the :END: marker."
(org-test-with-temp-text
test-line
(forward-char 1)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (re-search-forward "=\"x\"=" nil t))
(forward-line))))
@@ -859,7 +859,7 @@ trying to find the :END: marker."
;;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(re-search-forward "\\#\\+results:" nil t)
(forward-line)
(should (string=
@@ -870,7 +870,7 @@ trying to find the :END: marker."
2;;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(re-search-forward "\\#\\+results:" nil t)
(forward-line)
(should (string=
@@ -886,7 +886,7 @@ The block is actually executed /twice/ to ensure result
replacement happens correctly."
(org-test-with-temp-text
buffer-text
- (org-babel-next-src-block) (org-ctrl-c-ctrl-c) (org-ctrl-c-ctrl-c)
+ (org-babel-next-src-block) (org-babel-execute-maybe) (org-babel-execute-maybe)
(should (re-search-forward "\\#\\+results:" nil t))
(forward-line)
(should (string= result
--
2.1.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [PATCH] Replace `org-ctrl-c-ctrl-c' by `org-babel-execute-maybe' in tests
2014-12-29 16:06 ` [PATCH] Replace `org-ctrl-c-ctrl-c' by `org-babel-execute-maybe' in tests Sebastien Vauban
@ 2014-12-30 8:53 ` Nicolas Goaziou
2014-12-30 11:32 ` Sebastien Vauban
0 siblings, 1 reply; 22+ messages in thread
From: Nicolas Goaziou @ 2014-12-30 8:53 UTC (permalink / raw)
To: Org Mode List
Sending it again as your mail setup filters my answer.
Sebastien Vauban <sva-news-D0wtAvR13HarG/iDocfnWg@public.gmane.org>
writes:
> Here's a patch doing so.
I cannot apply your patch. Could you update your repository first, and
send it again as an attachment?
Thanks,
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH] Replace `org-ctrl-c-ctrl-c' by `org-babel-execute-maybe' in tests
2014-12-30 8:53 ` Nicolas Goaziou
@ 2014-12-30 11:32 ` Sebastien Vauban
2014-12-30 21:46 ` Nicolas Goaziou
0 siblings, 1 reply; 22+ messages in thread
From: Sebastien Vauban @ 2014-12-30 11:32 UTC (permalink / raw)
To: emacs-orgmode-mXXj517/zsQ
[-- Attachment #1: Type: text/plain, Size: 847 bytes --]
Hello Nicolas,
Nicolas Goaziou wrote:
> Sending it again as your mail setup filters my answer.
Not sure to understand. Never mind, though.
> Sebastien Vauban writes:
>
>> Here's a patch doing so.
>
> I cannot apply your patch. Could you update your repository first, and
> send it again as an attachment?
I am pretty sure I was up-to-date...
In fact, I'm ahead of `origin/master' by 3 commits:
- 2 about the "display of a count of items" functionality I've
implemented a while ago [1], and
- this new one (about renaming `org-ctrl-c-ctrl-c' to
`org-babel-execute-maybe').
Anyway, here is, attached, the results of the command:
git diff origin/master..master testing > org-babel-execute-maybe.patch
Thanks!
Best regards,
Seb
[1] https://lists.gnu.org/archive/html/emacs-orgmode/2013-09/msg01075.html
--
Sebastien Vauban
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: org-babel-execute-maybe.patch --]
[-- Type: text/x-patch, Size: 13506 bytes --]
diff --git a/testing/lisp/test-ob-emacs-lisp.el b/testing/lisp/test-ob-emacs-lisp.el
index f771ee3..bb3f51b 100644
--- a/testing/lisp/test-ob-emacs-lisp.el
+++ b/testing/lisp/test-ob-emacs-lisp.el
@@ -1,6 +1,6 @@
;;; test-ob-emacs-lisp.el
-;; Copyright (c) 2012, 2013, 2014 Free Software Foundation, Inc.
+;; Copyright (c) 2012-2014 Free Software Foundation, Inc.
;; Authors: Eric Schulte, Martyn Jago
;; This file is not part of GNU Emacs.
@@ -29,7 +29,7 @@
;;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (re-search-forward "results:" nil t))
(forward-line)
(should
@@ -42,7 +42,7 @@
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (re-search-forward "results:" nil t))
(forward-line)
(should
@@ -56,7 +56,7 @@
;;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(re-search-forward "results" nil t)
(forward-line)
(should (string=
@@ -69,7 +69,7 @@
2;;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(re-search-forward "results" nil t)
(forward-line)
(should (string=
diff --git a/testing/lisp/test-ob-ruby.el b/testing/lisp/test-ob-ruby.el
index ee7e837..28c06a4 100644
--- a/testing/lisp/test-ob-ruby.el
+++ b/testing/lisp/test-ob-ruby.el
@@ -1,6 +1,6 @@
;;; test-ob-ruby.el --- tests for ob-ruby.el
-;; Copyright (c) 2013 Oleh Krehel
+;; Copyright (c) 2013-2014 Oleh Krehel
;; Authors: Oleh Krehel
;; This program is free software; you can redistribute it and/or modify
@@ -28,7 +28,7 @@ s = \"2\"
s = \"3\"
puts s
#+end_src"
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(substring-no-properties
(buffer-string)))
"#+begin_src ruby :session :results output
@@ -47,7 +47,7 @@ puts s
s = \"5\"
puts s
#+end_src"
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(substring-no-properties
(buffer-string)))
"#+begin_src ruby :session :results output
@@ -63,7 +63,7 @@ puts s
(should (equal (org-test-with-temp-text "#+begin_src ruby :session :results output
puts s
#+end_src"
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(substring-no-properties
(buffer-string)))
"#+begin_src ruby :session :results output
diff --git a/testing/lisp/test-ob.el b/testing/lisp/test-ob.el
index efde99a..5b75e23 100644
--- a/testing/lisp/test-ob.el
+++ b/testing/lisp/test-ob.el
@@ -269,7 +269,7 @@ this is simple"
(ert-deftest test-org-babel/org-babel-get-inline-src-block-matches ()
(flet ((test-at-id (id)
- (org-test-at-id
+ (org-test-at-id
id
(let ((test-point (point)))
(should (fboundp 'org-babel-get-inline-src-block-matches))
@@ -298,18 +298,18 @@ this is simple"
;; src_ at bol line 1...
(org-test-with-temp-text
test-line
- (goto-char (point-min)) (org-ctrl-c-ctrl-c)
+ (goto-char (point-min)) (org-babel-execute-maybe)
(should (string=
(concat test-line " =1=")
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))
- (forward-char) (org-ctrl-c-ctrl-c)
+ (forward-char) (org-babel-execute-maybe)
(should (string=
(concat test-line " =1= =1=")
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))
(re-search-forward "1}")
- (should-error (org-ctrl-c-ctrl-c))
+ (should-error (org-babel-execute-maybe))
(backward-char) ;; last char of block body
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (string=
(concat test-line " =1= =1= =1=")
(buffer-substring-no-properties (point-at-bol) (point-at-eol)))))
@@ -317,29 +317,29 @@ this is simple"
(let ((test-line " src_emacs-lisp{ 1 }"))
(org-test-with-temp-text
test-line
- (should-error (org-ctrl-c-ctrl-c))
- (forward-char) (org-ctrl-c-ctrl-c)
+ (should-error (org-babel-execute-maybe))
+ (forward-char) (org-babel-execute-maybe)
(should (string=
(concat test-line " =1=")
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))
- (re-search-forward "{ 1 ") (org-ctrl-c-ctrl-c)
+ (re-search-forward "{ 1 ") (org-babel-execute-maybe)
(should (string=
(concat test-line " =1= =1=")
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))
(forward-char)
- (should-error (org-ctrl-c-ctrl-c))))))
+ (should-error (org-babel-execute-maybe))))))
(ert-deftest test-org-babel/inline-src_blk-default-results-replace-line-2 ()
;; src_ at bol line 2...
(let ((test-line " src_emacs-lisp{ \"x\" }"))
(org-test-with-temp-text
(concat "\n" test-line)
- (should-error (org-ctrl-c-ctrl-c))
+ (should-error (org-babel-execute-maybe))
(goto-char (point-min))
- (should-error (org-ctrl-c-ctrl-c))
+ (should-error (org-babel-execute-maybe))
(forward-line)
- (should-error (org-ctrl-c-ctrl-c))
- (forward-char) (org-ctrl-c-ctrl-c)
+ (should-error (org-babel-execute-maybe))
+ (forward-char) (org-babel-execute-maybe)
(should (string=
(concat test-line " =x=")
(buffer-substring-no-properties
@@ -350,27 +350,27 @@ this is simple"
test-line
(goto-char (point-max))
(insert (concat "\n" test-line " end"))
- (re-search-backward "src") (org-ctrl-c-ctrl-c)
+ (re-search-backward "src") (org-babel-execute-maybe)
(should (string=
(concat test-line " =y= end")
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))
- (re-search-forward "\" ") (org-ctrl-c-ctrl-c)
+ (re-search-forward "\" ") (org-babel-execute-maybe)
(should (string=
(concat test-line " =y= =y= end")
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))
(forward-char)
- (should-error (org-ctrl-c-ctrl-c)))))
+ (should-error (org-babel-execute-maybe)))))
(ert-deftest test-org-babel/inline-src_blk-manual-results-replace ()
(let ((test-line " src_emacs-lisp[:results replace]{ \"x\" }"))
(org-test-with-temp-text
(concat "\n" test-line)
- (should-error (org-ctrl-c-ctrl-c))
+ (should-error (org-babel-execute-maybe))
(goto-char (point-max))
- (should-error (org-ctrl-c-ctrl-c))
+ (should-error (org-babel-execute-maybe))
(beginning-of-line)
- (should-error (org-ctrl-c-ctrl-c))
- (forward-char) (org-ctrl-c-ctrl-c)
+ (should-error (org-babel-execute-maybe))
+ (forward-char) (org-babel-execute-maybe)
(should (string=
(concat test-line " =x=")
(buffer-substring-no-properties
@@ -381,68 +381,68 @@ this is simple"
(org-test-with-temp-text test-line
(goto-char (point-max))
(insert (concat "\n" test-line " end"))
- (re-search-backward "src") (org-ctrl-c-ctrl-c)
+ (re-search-backward "src") (org-babel-execute-maybe)
(should (string=
(concat test-line " =y= end")
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))
- (re-search-forward "\" ") (org-ctrl-c-ctrl-c)
+ (re-search-forward "\" ") (org-babel-execute-maybe)
(should (string=
(concat test-line " =y= =y= end")
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))
(forward-char)
- (should-error (org-ctrl-c-ctrl-c)))))
+ (should-error (org-babel-execute-maybe)))))
(ert-deftest test-org-babel/inline-src_blk-results-silent ()
(let ((test-line "src_emacs-lisp[ :results silent ]{ \"x\" }"))
(org-test-with-temp-text test-line
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (string= test-line
(buffer-substring-no-properties
(point-at-bol) (point-at-eol))))
(end-of-buffer)
- (should-error (org-ctrl-c-ctrl-c))))
+ (should-error (org-babel-execute-maybe))))
(let ((test-line (concat " Some text prior to block src_emacs-lisp"
"[ :results silent ]{ \"y\" }")))
(org-test-with-temp-text
test-line
(goto-char (point-max))
(insert (concat "\n" test-line " end"))
- (re-search-backward "src_") (org-ctrl-c-ctrl-c)
+ (re-search-backward "src_") (org-babel-execute-maybe)
(should (string= (concat test-line " end")
(buffer-substring-no-properties
(point-at-bol) (point-at-eol))))
- (re-search-forward "\" ") (org-ctrl-c-ctrl-c)
+ (re-search-forward "\" ") (org-babel-execute-maybe)
(should (string= (concat test-line " end")
(buffer-substring-no-properties
(point-at-bol) (point-at-eol))))
(forward-char)
- (should-error (org-ctrl-c-ctrl-c)))))
+ (should-error (org-babel-execute-maybe)))))
(ert-deftest test-org-babel/inline-src_blk-results-raw ()
(let ((test-line "src_emacs-lisp[ :results raw ]{ \"x\" }"))
(org-test-with-temp-text test-line
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (string= (concat test-line " x")
(buffer-string)))))
(let ((test-line (concat " Some text prior to block "
"src_emacs-lisp[ :results raw ]{ \"the\" }")))
(org-test-with-temp-text (concat test-line " end")
- (re-search-forward "src_") (org-ctrl-c-ctrl-c)
+ (re-search-forward "src_") (org-babel-execute-maybe)
(should (string= (concat test-line " the end")
(buffer-substring-no-properties
(point-at-bol) (point-at-eol))))
- (re-search-forward "\" ") (org-ctrl-c-ctrl-c)
+ (re-search-forward "\" ") (org-babel-execute-maybe)
(should (string= (concat test-line " the the end")
(buffer-substring-no-properties
(point-at-bol) (point-at-eol))))
(forward-char)
- (should-error (org-ctrl-c-ctrl-c)))))
+ (should-error (org-babel-execute-maybe)))))
(ert-deftest test-org-babel/inline-src_blk-results-file ()
(let ((test-line "src_emacs-lisp[ :results file ]{ \"~/test-file\" }"))
(org-test-with-temp-text
test-line
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (string= (concat test-line " [[file:~/test-file]]")
(buffer-substring-no-properties
(point-min) (point-max)))))))
@@ -451,7 +451,7 @@ this is simple"
(let ((test-line "src_emacs-lisp[ :results scalar ]{ \"x\" }"))
(org-test-with-temp-text
test-line
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (string= (concat test-line " =\"x\"=")
(buffer-substring-no-properties
(point-min) (point-max)))))))
@@ -460,7 +460,7 @@ this is simple"
(let ((test-line "src_emacs-lisp[ :results verbatim ]{ \"x\" }"))
(org-test-with-temp-text
test-line
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (string= (concat test-line " =\"x\"=")
(buffer-substring-no-properties
(point-min) (point-max)))))))
@@ -710,7 +710,7 @@ on two lines
;;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (re-search-forward "\\#\\+results:" nil t))
(forward-line)
(should
@@ -722,7 +722,7 @@ on two lines
\"some text\";;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (re-search-forward "\\#\\+results:" nil t))
(forward-line)
(should
@@ -736,7 +736,7 @@ on two lines
;;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(re-search-forward "\\#\\+results:" nil t)
(forward-line)
(should (string=
@@ -747,7 +747,7 @@ on two lines
2;;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(re-search-forward "\\#\\+results:" nil t)
(forward-line)
(should (string=
@@ -763,7 +763,7 @@ The block is actually executed /twice/ to ensure result
replacement happens correctly."
(org-test-with-temp-text
buffer-text
- (org-babel-next-src-block) (org-ctrl-c-ctrl-c) (org-ctrl-c-ctrl-c)
+ (org-babel-next-src-block) (org-babel-execute-maybe) (org-babel-execute-maybe)
(should (re-search-forward "\\#\\+results:" nil t))
(forward-line)
(should (string= result
@@ -849,7 +849,7 @@ trying to find the :END: marker."
(org-test-with-temp-text
test-line
(forward-char 1)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (re-search-forward "=\"x\"=" nil t))
(forward-line))))
@@ -859,7 +859,7 @@ trying to find the :END: marker."
;;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(re-search-forward "\\#\\+results:" nil t)
(forward-line)
(should (string=
@@ -870,7 +870,7 @@ trying to find the :END: marker."
2;;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(re-search-forward "\\#\\+results:" nil t)
(forward-line)
(should (string=
@@ -886,7 +886,7 @@ The block is actually executed /twice/ to ensure result
replacement happens correctly."
(org-test-with-temp-text
buffer-text
- (org-babel-next-src-block) (org-ctrl-c-ctrl-c) (org-ctrl-c-ctrl-c)
+ (org-babel-next-src-block) (org-babel-execute-maybe) (org-babel-execute-maybe)
(should (re-search-forward "\\#\\+results:" nil t))
(forward-line)
(should (string= result
^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [PATCH] Replace `org-ctrl-c-ctrl-c' by `org-babel-execute-maybe' in tests
2014-12-30 11:32 ` Sebastien Vauban
@ 2014-12-30 21:46 ` Nicolas Goaziou
[not found] ` <87y4polsjv.fsf-Gpy5sJQTEQHwkn9pgDnJRVAUjnlXr6A1@public.gmane.org>
0 siblings, 1 reply; 22+ messages in thread
From: Nicolas Goaziou @ 2014-12-30 21:46 UTC (permalink / raw)
To: Org Mode List
Sebastien Vauban <sva-news-D0wtAvR13HarG/iDocfnWg@public.gmane.org>
writes:
> Not sure to understand. Never mind, though.
I cannot do "Reply to all" since your address is invalid. Therefore,
I have to rewrite "To" header each time.
> Anyway, here is, attached, the results of the command:
>
> git diff origin/master..master testing > org-babel-execute-maybe.patch
Could you use git format-patch instead?
Thanks,
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH] Replace `org-ctrl-c-ctrl-c' by `org-babel-execute-maybe' in tests
[not found] ` <87y4polsjv.fsf-Gpy5sJQTEQHwkn9pgDnJRVAUjnlXr6A1@public.gmane.org>
@ 2014-12-30 23:34 ` Sebastien Vauban
2015-01-03 10:56 ` Nicolas Goaziou
0 siblings, 1 reply; 22+ messages in thread
From: Sebastien Vauban @ 2014-12-30 23:34 UTC (permalink / raw)
To: Org Mode List
[-- Attachment #1: Type: text/plain, Size: 721 bytes --]
Nicolas Goaziou wrote:
> Sebastien Vauban <sva-news-D0wtAvR13HarG/iDocfnWg-XMD5yJDbdMReXY1tMh2IBg@public.gmane.org> writes:
>
>> Not sure to understand. Never mind, though.
>
> I cannot do "Reply to all" since your address is invalid.
You mean "sva-news-D0wtAvR13HarG/iDocfnWg-XMD5yJDbdMReXY1tMh2IBg@public.gmane.org" here above?
> Therefore, I have to rewrite "To" header each time.
I'm quite positive you can use it: it'll be forwarded to me. Try it!
>> Anyway, here is, attached, the results of the command:
>>
>> git diff origin/master..master testing > org-babel-execute-maybe.patch
>
> Could you use git format-patch instead?
Of course. Sorry. Here it is.
Best regards,
Seb
--
Sebastien Vauban
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Replace-org-ctrl-c-ctrl-c-by-org-babel-execute-maybe.patch --]
[-- Type: text/x-patch, Size: 14120 bytes --]
From 27ff606c268b79158fe32627ff651d0500d38468 Mon Sep 17 00:00:00 2001
From: Sebastien Vauban <sva-news-D0wtAvR13HarG/iDocfnWg@public.gmane.org>
Date: Mon, 29 Dec 2014 17:02:06 +0100
Subject: [PATCH] Replace `org-ctrl-c-ctrl-c' by `org-babel-execute-maybe' in tests
* test-ob-emacs-lisp.el, test-ob-ruby.el, test-ob.el: Replace `org-ctrl-c-ctrl-c' by `org-babel-execute-maybe' in tests.
---
testing/lisp/test-ob-emacs-lisp.el | 10 ++---
testing/lisp/test-ob-ruby.el | 8 ++--
testing/lisp/test-ob.el | 88 +++++++++++++++++++-------------------
3 files changed, 53 insertions(+), 53 deletions(-)
diff --git a/testing/lisp/test-ob-emacs-lisp.el b/testing/lisp/test-ob-emacs-lisp.el
index f771ee3..bb3f51b 100644
--- a/testing/lisp/test-ob-emacs-lisp.el
+++ b/testing/lisp/test-ob-emacs-lisp.el
@@ -1,6 +1,6 @@
;;; test-ob-emacs-lisp.el
-;; Copyright (c) 2012, 2013, 2014 Free Software Foundation, Inc.
+;; Copyright (c) 2012-2014 Free Software Foundation, Inc.
;; Authors: Eric Schulte, Martyn Jago
;; This file is not part of GNU Emacs.
@@ -29,7 +29,7 @@
;;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (re-search-forward "results:" nil t))
(forward-line)
(should
@@ -42,7 +42,7 @@
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (re-search-forward "results:" nil t))
(forward-line)
(should
@@ -56,7 +56,7 @@
;;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(re-search-forward "results" nil t)
(forward-line)
(should (string=
@@ -69,7 +69,7 @@
2;;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(re-search-forward "results" nil t)
(forward-line)
(should (string=
diff --git a/testing/lisp/test-ob-ruby.el b/testing/lisp/test-ob-ruby.el
index ee7e837..28c06a4 100644
--- a/testing/lisp/test-ob-ruby.el
+++ b/testing/lisp/test-ob-ruby.el
@@ -1,6 +1,6 @@
;;; test-ob-ruby.el --- tests for ob-ruby.el
-;; Copyright (c) 2013 Oleh Krehel
+;; Copyright (c) 2013-2014 Oleh Krehel
;; Authors: Oleh Krehel
;; This program is free software; you can redistribute it and/or modify
@@ -28,7 +28,7 @@ s = \"2\"
s = \"3\"
puts s
#+end_src"
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(substring-no-properties
(buffer-string)))
"#+begin_src ruby :session :results output
@@ -47,7 +47,7 @@ puts s
s = \"5\"
puts s
#+end_src"
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(substring-no-properties
(buffer-string)))
"#+begin_src ruby :session :results output
@@ -63,7 +63,7 @@ puts s
(should (equal (org-test-with-temp-text "#+begin_src ruby :session :results output
puts s
#+end_src"
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(substring-no-properties
(buffer-string)))
"#+begin_src ruby :session :results output
diff --git a/testing/lisp/test-ob.el b/testing/lisp/test-ob.el
index efde99a..5b75e23 100644
--- a/testing/lisp/test-ob.el
+++ b/testing/lisp/test-ob.el
@@ -269,7 +269,7 @@ this is simple"
(ert-deftest test-org-babel/org-babel-get-inline-src-block-matches ()
(flet ((test-at-id (id)
- (org-test-at-id
+ (org-test-at-id
id
(let ((test-point (point)))
(should (fboundp 'org-babel-get-inline-src-block-matches))
@@ -298,18 +298,18 @@ this is simple"
;; src_ at bol line 1...
(org-test-with-temp-text
test-line
- (goto-char (point-min)) (org-ctrl-c-ctrl-c)
+ (goto-char (point-min)) (org-babel-execute-maybe)
(should (string=
(concat test-line " =1=")
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))
- (forward-char) (org-ctrl-c-ctrl-c)
+ (forward-char) (org-babel-execute-maybe)
(should (string=
(concat test-line " =1= =1=")
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))
(re-search-forward "1}")
- (should-error (org-ctrl-c-ctrl-c))
+ (should-error (org-babel-execute-maybe))
(backward-char) ;; last char of block body
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (string=
(concat test-line " =1= =1= =1=")
(buffer-substring-no-properties (point-at-bol) (point-at-eol)))))
@@ -317,29 +317,29 @@ this is simple"
(let ((test-line " src_emacs-lisp{ 1 }"))
(org-test-with-temp-text
test-line
- (should-error (org-ctrl-c-ctrl-c))
- (forward-char) (org-ctrl-c-ctrl-c)
+ (should-error (org-babel-execute-maybe))
+ (forward-char) (org-babel-execute-maybe)
(should (string=
(concat test-line " =1=")
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))
- (re-search-forward "{ 1 ") (org-ctrl-c-ctrl-c)
+ (re-search-forward "{ 1 ") (org-babel-execute-maybe)
(should (string=
(concat test-line " =1= =1=")
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))
(forward-char)
- (should-error (org-ctrl-c-ctrl-c))))))
+ (should-error (org-babel-execute-maybe))))))
(ert-deftest test-org-babel/inline-src_blk-default-results-replace-line-2 ()
;; src_ at bol line 2...
(let ((test-line " src_emacs-lisp{ \"x\" }"))
(org-test-with-temp-text
(concat "\n" test-line)
- (should-error (org-ctrl-c-ctrl-c))
+ (should-error (org-babel-execute-maybe))
(goto-char (point-min))
- (should-error (org-ctrl-c-ctrl-c))
+ (should-error (org-babel-execute-maybe))
(forward-line)
- (should-error (org-ctrl-c-ctrl-c))
- (forward-char) (org-ctrl-c-ctrl-c)
+ (should-error (org-babel-execute-maybe))
+ (forward-char) (org-babel-execute-maybe)
(should (string=
(concat test-line " =x=")
(buffer-substring-no-properties
@@ -350,27 +350,27 @@ this is simple"
test-line
(goto-char (point-max))
(insert (concat "\n" test-line " end"))
- (re-search-backward "src") (org-ctrl-c-ctrl-c)
+ (re-search-backward "src") (org-babel-execute-maybe)
(should (string=
(concat test-line " =y= end")
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))
- (re-search-forward "\" ") (org-ctrl-c-ctrl-c)
+ (re-search-forward "\" ") (org-babel-execute-maybe)
(should (string=
(concat test-line " =y= =y= end")
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))
(forward-char)
- (should-error (org-ctrl-c-ctrl-c)))))
+ (should-error (org-babel-execute-maybe)))))
(ert-deftest test-org-babel/inline-src_blk-manual-results-replace ()
(let ((test-line " src_emacs-lisp[:results replace]{ \"x\" }"))
(org-test-with-temp-text
(concat "\n" test-line)
- (should-error (org-ctrl-c-ctrl-c))
+ (should-error (org-babel-execute-maybe))
(goto-char (point-max))
- (should-error (org-ctrl-c-ctrl-c))
+ (should-error (org-babel-execute-maybe))
(beginning-of-line)
- (should-error (org-ctrl-c-ctrl-c))
- (forward-char) (org-ctrl-c-ctrl-c)
+ (should-error (org-babel-execute-maybe))
+ (forward-char) (org-babel-execute-maybe)
(should (string=
(concat test-line " =x=")
(buffer-substring-no-properties
@@ -381,68 +381,68 @@ this is simple"
(org-test-with-temp-text test-line
(goto-char (point-max))
(insert (concat "\n" test-line " end"))
- (re-search-backward "src") (org-ctrl-c-ctrl-c)
+ (re-search-backward "src") (org-babel-execute-maybe)
(should (string=
(concat test-line " =y= end")
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))
- (re-search-forward "\" ") (org-ctrl-c-ctrl-c)
+ (re-search-forward "\" ") (org-babel-execute-maybe)
(should (string=
(concat test-line " =y= =y= end")
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))
(forward-char)
- (should-error (org-ctrl-c-ctrl-c)))))
+ (should-error (org-babel-execute-maybe)))))
(ert-deftest test-org-babel/inline-src_blk-results-silent ()
(let ((test-line "src_emacs-lisp[ :results silent ]{ \"x\" }"))
(org-test-with-temp-text test-line
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (string= test-line
(buffer-substring-no-properties
(point-at-bol) (point-at-eol))))
(end-of-buffer)
- (should-error (org-ctrl-c-ctrl-c))))
+ (should-error (org-babel-execute-maybe))))
(let ((test-line (concat " Some text prior to block src_emacs-lisp"
"[ :results silent ]{ \"y\" }")))
(org-test-with-temp-text
test-line
(goto-char (point-max))
(insert (concat "\n" test-line " end"))
- (re-search-backward "src_") (org-ctrl-c-ctrl-c)
+ (re-search-backward "src_") (org-babel-execute-maybe)
(should (string= (concat test-line " end")
(buffer-substring-no-properties
(point-at-bol) (point-at-eol))))
- (re-search-forward "\" ") (org-ctrl-c-ctrl-c)
+ (re-search-forward "\" ") (org-babel-execute-maybe)
(should (string= (concat test-line " end")
(buffer-substring-no-properties
(point-at-bol) (point-at-eol))))
(forward-char)
- (should-error (org-ctrl-c-ctrl-c)))))
+ (should-error (org-babel-execute-maybe)))))
(ert-deftest test-org-babel/inline-src_blk-results-raw ()
(let ((test-line "src_emacs-lisp[ :results raw ]{ \"x\" }"))
(org-test-with-temp-text test-line
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (string= (concat test-line " x")
(buffer-string)))))
(let ((test-line (concat " Some text prior to block "
"src_emacs-lisp[ :results raw ]{ \"the\" }")))
(org-test-with-temp-text (concat test-line " end")
- (re-search-forward "src_") (org-ctrl-c-ctrl-c)
+ (re-search-forward "src_") (org-babel-execute-maybe)
(should (string= (concat test-line " the end")
(buffer-substring-no-properties
(point-at-bol) (point-at-eol))))
- (re-search-forward "\" ") (org-ctrl-c-ctrl-c)
+ (re-search-forward "\" ") (org-babel-execute-maybe)
(should (string= (concat test-line " the the end")
(buffer-substring-no-properties
(point-at-bol) (point-at-eol))))
(forward-char)
- (should-error (org-ctrl-c-ctrl-c)))))
+ (should-error (org-babel-execute-maybe)))))
(ert-deftest test-org-babel/inline-src_blk-results-file ()
(let ((test-line "src_emacs-lisp[ :results file ]{ \"~/test-file\" }"))
(org-test-with-temp-text
test-line
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (string= (concat test-line " [[file:~/test-file]]")
(buffer-substring-no-properties
(point-min) (point-max)))))))
@@ -451,7 +451,7 @@ this is simple"
(let ((test-line "src_emacs-lisp[ :results scalar ]{ \"x\" }"))
(org-test-with-temp-text
test-line
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (string= (concat test-line " =\"x\"=")
(buffer-substring-no-properties
(point-min) (point-max)))))))
@@ -460,7 +460,7 @@ this is simple"
(let ((test-line "src_emacs-lisp[ :results verbatim ]{ \"x\" }"))
(org-test-with-temp-text
test-line
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (string= (concat test-line " =\"x\"=")
(buffer-substring-no-properties
(point-min) (point-max)))))))
@@ -710,7 +710,7 @@ on two lines
;;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (re-search-forward "\\#\\+results:" nil t))
(forward-line)
(should
@@ -722,7 +722,7 @@ on two lines
\"some text\";;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (re-search-forward "\\#\\+results:" nil t))
(forward-line)
(should
@@ -736,7 +736,7 @@ on two lines
;;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(re-search-forward "\\#\\+results:" nil t)
(forward-line)
(should (string=
@@ -747,7 +747,7 @@ on two lines
2;;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(re-search-forward "\\#\\+results:" nil t)
(forward-line)
(should (string=
@@ -763,7 +763,7 @@ The block is actually executed /twice/ to ensure result
replacement happens correctly."
(org-test-with-temp-text
buffer-text
- (org-babel-next-src-block) (org-ctrl-c-ctrl-c) (org-ctrl-c-ctrl-c)
+ (org-babel-next-src-block) (org-babel-execute-maybe) (org-babel-execute-maybe)
(should (re-search-forward "\\#\\+results:" nil t))
(forward-line)
(should (string= result
@@ -849,7 +849,7 @@ trying to find the :END: marker."
(org-test-with-temp-text
test-line
(forward-char 1)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (re-search-forward "=\"x\"=" nil t))
(forward-line))))
@@ -859,7 +859,7 @@ trying to find the :END: marker."
;;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(re-search-forward "\\#\\+results:" nil t)
(forward-line)
(should (string=
@@ -870,7 +870,7 @@ trying to find the :END: marker."
2;;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(re-search-forward "\\#\\+results:" nil t)
(forward-line)
(should (string=
@@ -886,7 +886,7 @@ The block is actually executed /twice/ to ensure result
replacement happens correctly."
(org-test-with-temp-text
buffer-text
- (org-babel-next-src-block) (org-ctrl-c-ctrl-c) (org-ctrl-c-ctrl-c)
+ (org-babel-next-src-block) (org-babel-execute-maybe) (org-babel-execute-maybe)
(should (re-search-forward "\\#\\+results:" nil t))
(forward-line)
(should (string= result
--
2.1.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: 63 failures for org-test-run-all-tests in an Emacs GUI
2014-12-24 9:53 ` Nicolas Goaziou
2014-12-24 10:33 ` Sebastien Vauban
@ 2014-12-31 9:25 ` Sebastien Vauban
2015-01-03 10:57 ` Nicolas Goaziou
1 sibling, 1 reply; 22+ messages in thread
From: Sebastien Vauban @ 2014-12-31 9:25 UTC (permalink / raw)
To: emacs-orgmode-mXXj517/zsQ
Hello Nicolas,
Nicolas Goaziou wrote:
> Sebastien Vauban writes:
>
>> I just ran `org-test-run-all-tests' in my active WinNT Emacs session
>> (with Org-mode release_8.3beta-677-g0497e3), and was surprised by the
>> high number of failures:
>
> You probably heavily customized Org, and many tests expect default
> values for defcustoms to run properly.
>
> I fixed the most obvious one, but there is more work to do in that area.
Did I misunderstand the change of last year (Dec '13) or should `sh'
language be abandoned in favor of `shell'?
IIUC, then, those blocks should be updated:
--8<---------------cut here---------------start------------->8---
./examples/babel.org:238:#+begin_src sh :tangle yes :noweb yes :shebang "#!/bin/sh"
./examples/babel.org:243:#+begin_src sh :noweb-ref fullest-disk
./examples/babel.org:248:#+begin_src sh :noweb-ref fullest-disk
./examples/babel.org:253:#+begin_src sh :noweb-ref fullest-disk
./examples/babel.org:258:#+begin_src sh :noweb-ref fullest-disk
./examples/babel.org:315:#+begin_src sh :foo "baz"
./examples/babel.org:327:#+BEGIN_SRC sh :exports none
./examples/babel.org:333:#+BEGIN_SRC sh :noweb no-export :exports both
./examples/babel.org:376:#+BEGIN_SRC sh :exports none
./examples/babel.org:380:#+BEGIN_SRC sh :noweb strip-export :exports code :results silent
./examples/babel.org:447:#+BEGIN_SRC sh :shebang #!/bin/sh :exports results :results verbatim
./examples/ob-shell-test.org:25:#+begin_src sh :exports results :var array=sample_array
./examples/ob-shell-test.org:50:#+begin_src sh :exports results :var table=sample_mapping_table
./examples/ob-shell-test.org:72:#+begin_src sh :exports results :var table=sample_big_table
./lisp/test-ob.el:471:#+begin_src sh :results scalar
./lisp/test-ob.el:478:#+begin_src sh :results raw scalar
./lisp/test-ob.el:509: (org-test-with-temp-text "#+begin_src sh\necho Hello\n#+end_src\n"
./lisp/test-ob.el:669: (org-test-with-temp-text "#+begin_src sh :results output :tangle yes
./lisp/test-ob.el:674:#+begin_src sh
./lisp/test-ob.el:680: (org-test-with-temp-text "#+begin_src sh :results output :tangle yes
./lisp/test-ob.el:685:#+begin_src sh :noweb-sep \"\"
./lisp/test-ob.el:689:#+begin_src sh :noweb-ref foo :noweb-sep \"\"
./lisp/test-ob.el:812: #+begin_src sh :results file wrap
./lisp/test-ob.el:1140:#+begin_src sh :var data=input-table :exports results :colnames '(Rev Author)
./lisp/test-ob.el:1158:#+begin_src sh :var data=input-table :exports results :colnames '(Rev Author)
./README:20:#+BEGIN_SRC sh :dir (expand-file-name "..")
--8<---------------cut here---------------end--------------->8---
And those inline calls as well:
--8<---------------cut here---------------start------------->8---
./examples/babel.org:199:Here is one in the middle src_sh{echo 1} of a line.
./examples/babel.org:200:Here is one at the end of a line. src_sh{echo 2}
./examples/babel.org:201:src_sh{echo 3} Here is one at the beginning of a line.
./examples/babel.org:209:Here is one in the middle src_sh{echo 1} of a line.
./examples/babel.org:210:Here is one at the end of a line. src_sh{echo 2}
./examples/babel.org:211:src_sh{echo 3} Here is one at the beginning of a line.
./examples/babel.org:212:Here is one that is also evaluated: src_sh[:exports both]{echo 4}
./examples/babel.org:293:src_sh{echo "One"} block at start of line
./examples/babel.org:294: One spaced block in src_sh{ echo "middle" } of line
./examples/babel.org:295:src_sh{echo 2} blocks on the src_emacs-lisp{"same"} line
./examples/babel.org:296: Inline block with src_sh[:results silent]{ echo "parameters" }.
./examples/babel.org:303:src_sh[]{echo "One"} block at start of line
./examples/babel.org:304: One spaced block in src_sh[]{ echo "middle" } of line
./examples/babel.org:305:src_sh[]{echo 2} blocks on the src_emacs-lisp[]{"same"} line
./examples/babel.org:306: Inline block with src_sh[:results silent]{ echo "parameters" }.
./lisp/test-ob-exp.el:242: "\\\\\\[]{" "\\(?:\\[]\\)?{" ;accept both src_sh[]{...} or src_sh{...}
./lisp/test-ob-exp.el:243: (regexp-quote "Here is one in the middle src_sh[]{echo 1} of a line.
./lisp/test-ob-exp.el:244:Here is one at the end of a line. src_sh[]{echo 2}
./lisp/test-ob-exp.el:245:src_sh[]{echo 3} Here is one at the beginning of a line.
./lisp/test-ob-exp.el:246:Here is one that is also evaluated: src_sh[]{echo 4} =4=")
./lisp/test-ob.el:297: (let ((test-line "src_sh{echo 1}"))
--8<---------------cut here---------------end--------------->8---
I am willing to make the patch.
Best regards,
Seb
--
Sebastien Vauban
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH] Replace `org-ctrl-c-ctrl-c' by `org-babel-execute-maybe' in tests
2014-12-30 23:34 ` Sebastien Vauban
@ 2015-01-03 10:56 ` Nicolas Goaziou
2015-01-23 15:05 ` Sebastien Vauban
0 siblings, 1 reply; 22+ messages in thread
From: Nicolas Goaziou @ 2015-01-03 10:56 UTC (permalink / raw)
To: Org Mode List
Sebastien Vauban <sva-news-D0wtAvR13HarG/iDocfnWg@public.gmane.org>
writes:
> I'm quite positive you can use it: it'll be forwarded to me. Try it!
I tried. Sometimes it indeed reaches you. Sometimes it doesn't appear on
the ML before days. Sometimes it just returns to me with a failure.
>>> Anyway, here is, attached, the results of the command:
>>>
>>> git diff origin/master..master testing > org-babel-execute-maybe.patch
>>
>> Could you use git format-patch instead?
>
> Of course. Sorry. Here it is.
I still cannot apply it. It may be related to a whitespace change in
"test-ob.el":
Application : Replace `org-ctrl-c-ctrl-c' by `org-babel-execute-maybe' in tests
error: le patch a échoué : testing/lisp/test-ob.el:269
error: testing/lisp/test-ob.el : le patch ne s'applique pas
Regards,
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: 63 failures for org-test-run-all-tests in an Emacs GUI
2014-12-31 9:25 ` 63 failures for org-test-run-all-tests in an Emacs GUI Sebastien Vauban
@ 2015-01-03 10:57 ` Nicolas Goaziou
2015-01-09 21:01 ` Sebastien Vauban
0 siblings, 1 reply; 22+ messages in thread
From: Nicolas Goaziou @ 2015-01-03 10:57 UTC (permalink / raw)
To: Sebastien Vauban; +Cc: public-emacs-orgmode-mXXj517/zsQ
Sebastien Vauban <sva-news-D0wtAvR13HarG/iDocfnWg@public.gmane.org>
writes:
> Did I misunderstand the change of last year (Dec '13) or should `sh'
> language be abandoned in favor of `shell'?
I think you're right.
> IIUC, then, those blocks should be updated:
[...]
> And those inline calls as well:
[...]
> I am willing to make the patch.
Great. Please do.
Regards,
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: 63 failures for org-test-run-all-tests in an Emacs GUI
2015-01-03 10:57 ` Nicolas Goaziou
@ 2015-01-09 21:01 ` Sebastien Vauban
2015-01-10 10:17 ` Nicolas Goaziou
0 siblings, 1 reply; 22+ messages in thread
From: Sebastien Vauban @ 2015-01-09 21:01 UTC (permalink / raw)
To: emacs-orgmode-mXXj517/zsQ
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
Nicolas Goaziou wrote:
> Sebastien Vauban writes:
>
>> Did I misunderstand the change of last year (Dec '13) or should `sh'
>> language be abandoned in favor of `shell'?
>
> I think you're right.
>
>> IIUC, then, those blocks should be updated: ...
>> And those inline calls as well: ...
>> I am willing to make the patch.
>
> Great. Please do.
Here it is.
Best regards,
Seb
--
Sebastien Vauban
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Replace-sh-language-by-shell.patch --]
[-- Type: text/x-patch, Size: 12964 bytes --]
From: Sebastien Vauban <sva-news-D0wtAvR13HarG/iDocfnWg@public.gmane.org>
Date: Fri, 9 Jan 2015 11:10:25 +0100
Subject: [PATCH] Replace `sh' language by `shell'
* README, babel.org, ob-shell-test.org, test-ob-exp.el,
test-ob.el: Replace `sh' language by `shell'.
---
testing/README | 2 +-
testing/examples/babel.org | 54 +++++++++++++++++++-------------------
testing/examples/ob-shell-test.org | 11 ++++----
testing/lisp/test-ob-exp.el | 12 ++++-----
testing/lisp/test-ob.el | 28 ++++++++++----------
5 files changed, 53 insertions(+), 54 deletions(-)
diff --git a/testing/README b/testing/README
index 34f6fcd..d8a31ac 100644
--- a/testing/README
+++ b/testing/README
@@ -17,7 +17,7 @@ relative to the base of the Org-mode directory.
Also note that many of the current tests uses babel evaluation...
-#+BEGIN_SRC sh :dir (expand-file-name "..")
+#+BEGIN_SRC shell :dir (expand-file-name "..")
# For Emacs earlier than 24, add -L /path/to/ert
emacs -Q --batch \
-L lisp/ -L testing/ -L testing/lisp -l lisp/org.el \
diff --git a/testing/examples/babel.org b/testing/examples/babel.org
index 8bae65b..978df7a 100644
--- a/testing/examples/babel.org
+++ b/testing/examples/babel.org
@@ -125,7 +125,7 @@
(list (my-map 'list #'+
(append prev-row '(0))
(append '(0) prev-row)))))))
-
+
(pascals-triangle n)
#+end_src
@@ -196,9 +196,9 @@ an = sign.
:results: silent
:ID: 54cb8dc3-298c-4883-a933-029b3c9d4b18
:END:
-Here is one in the middle src_sh{echo 1} of a line.
-Here is one at the end of a line. src_sh{echo 2}
-src_sh{echo 3} Here is one at the beginning of a line.
+Here is one in the middle src_shell{echo 1} of a line.
+Here is one at the end of a line. src_shell{echo 2}
+src_shell{echo 3} Here is one at the beginning of a line.
* exported inline source block
:PROPERTIES:
@@ -206,10 +206,10 @@ src_sh{echo 3} Here is one at the beginning of a line.
:results: silent
:exports: code
:END:
-Here is one in the middle src_sh{echo 1} of a line.
-Here is one at the end of a line. src_sh{echo 2}
-src_sh{echo 3} Here is one at the beginning of a line.
-Here is one that is also evaluated: src_sh[:exports both]{echo 4}
+Here is one in the middle src_shell{echo 1} of a line.
+Here is one at the end of a line. src_shell{echo 2}
+src_shell{echo 3} Here is one at the beginning of a line.
+Here is one that is also evaluated: src_shell[:exports both]{echo 4}
* mixed blocks with exports both
:PROPERTIES:
@@ -235,27 +235,27 @@ Here is one that is also evaluated: src_sh[:exports both]{echo 4}
:noweb-sep: ""
:END:
-#+begin_src sh :tangle yes :noweb yes :shebang "#!/bin/sh"
+#+begin_src shell :tangle yes :noweb yes :shebang "#!/bin/sh"
<<fullest-disk>>
#+end_src
** query all mounted disks
-#+begin_src sh :noweb-ref fullest-disk
+#+begin_src shell :noweb-ref fullest-disk
df
#+end_src
** strip the header row
-#+begin_src sh :noweb-ref fullest-disk
+#+begin_src shell :noweb-ref fullest-disk
|sed '1d'
#+end_src
** sort by the percent full
-#+begin_src sh :noweb-ref fullest-disk
+#+begin_src shell :noweb-ref fullest-disk
|awk '{print $5 " " $6}'|sort -n |tail -1
#+end_src
** extract the mount point
-#+begin_src sh :noweb-ref fullest-disk
+#+begin_src shell :noweb-ref fullest-disk
|awk '{print $2}'
#+end_src
* resolving sub-trees as references
@@ -290,20 +290,20 @@ has length 14
:results: silent
:ID: 0D0983D4-DE33-400A-8A05-A225A567BC74
:END:
-src_sh{echo "One"} block at start of line
- One spaced block in src_sh{ echo "middle" } of line
-src_sh{echo 2} blocks on the src_emacs-lisp{"same"} line
- Inline block with src_sh[:results silent]{ echo "parameters" }.
+src_shell{echo "One"} block at start of line
+ One spaced block in src_shell{ echo "middle" } of line
+src_shell{echo 2} blocks on the src_emacs-lisp{"same"} line
+ Inline block with src_shell[:results silent]{ echo "parameters" }.
* org-babel-get-inline-src-block-matches (with empty args)
:PROPERTIES:
:results: silent
:ID: d55dada7-de0e-4340-8061-787cccbedee5
:END:
-src_sh[]{echo "One"} block at start of line
- One spaced block in src_sh[]{ echo "middle" } of line
-src_sh[]{echo 2} blocks on the src_emacs-lisp[]{"same"} line
- Inline block with src_sh[:results silent]{ echo "parameters" }.
+src_shell[]{echo "One"} block at start of line
+ One spaced block in src_shell[]{ echo "middle" } of line
+src_shell[]{echo 2} blocks on the src_emacs-lisp[]{"same"} line
+ Inline block with src_shell[:results silent]{ echo "parameters" }.
* exporting a code block with a name
:PROPERTIES:
@@ -312,7 +312,7 @@ src_sh[]{echo 2} blocks on the src_emacs-lisp[]{"same"} line
exporting a code block with a name
#+name: qux
-#+begin_src sh :foo "baz"
+#+begin_src shell :foo "baz"
echo bar
#+end_src
* noweb no-export and exports both
@@ -324,13 +324,13 @@ Weird interaction.
here is one block
#+name: noweb-no-export-and-exports-both-1
-#+BEGIN_SRC sh :exports none
+#+BEGIN_SRC shell :exports none
echo 1
#+END_SRC
and another
-#+BEGIN_SRC sh :noweb no-export :exports both
+#+BEGIN_SRC shell :noweb no-export :exports both
# I am inside the code block
<<noweb-no-export-and-exports-both-1>>
#+END_SRC
@@ -373,11 +373,11 @@ Here is a call line with more than just the results exported.
:END:
#+name: strip-export-1
-#+BEGIN_SRC sh :exports none
+#+BEGIN_SRC shell :exports none
i="10"
#+END_SRC
-#+BEGIN_SRC sh :noweb strip-export :exports code :results silent
+#+BEGIN_SRC shell :noweb strip-export :exports code :results silent
<<strip-export-1>>
echo "1$i"
#+END_SRC
@@ -444,7 +444,7 @@ comments for ":var":
#+HEADER: :var c=(or (org-entry-get org-babel-current-src-block-location "c" t) "0")
#+HEADER: :var d=(or (org-entry-get org-babel-current-src-block-location "d" t) "0")
#+HEADER: :var e=(or (org-entry-get org-babel-current-src-block-location "e" t) "0")
-#+BEGIN_SRC sh :shebang #!/bin/sh :exports results :results verbatim
+#+BEGIN_SRC shell :shebang #!/bin/sh :exports results :results verbatim
printf "shell a:$a, b:$b, c:$c, d:$d, e:$e"
#+END_SRC
diff --git a/testing/examples/ob-shell-test.org b/testing/examples/ob-shell-test.org
index a54e5c0..ce4ae79 100644
--- a/testing/examples/ob-shell-test.org
+++ b/testing/examples/ob-shell-test.org
@@ -22,7 +22,7 @@
:ID: 0ba56632-8dc1-405c-a083-c204bae477cf
:END:
** Generic shell: no arrays
-#+begin_src sh :exports results :var array=sample_array
+#+begin_src shell :exports results :var array=sample_array
echo ${array}
#+end_src
@@ -32,7 +32,7 @@ echo ${array}
** Bash shell: support for arrays
Bash will see a simple indexed array. In this test, we check that the
returned value is indeed only the first item of the array, as opposed to
-the generic serialiation that will return all elements of the array as
+the generic serialiation that will return all elements of the array as
a single string.
#+begin_src bash :exports results :var array=sample_array
echo ${array}
@@ -47,7 +47,7 @@ echo ${array}
:END:
** Generic shell: no special handing
The shell will see all values as a single string.
-#+begin_src sh :exports results :var table=sample_mapping_table
+#+begin_src shell :exports results :var table=sample_mapping_table
echo ${table}
#+end_src
@@ -69,13 +69,13 @@ echo ${table[second]}
:ID: 82320a48-3409-49d7-85c9-5de1c6d3ff87
:END:
** Generic shell: no special handing
-#+begin_src sh :exports results :var table=sample_big_table
+#+begin_src shell :exports results :var table=sample_big_table
echo ${table}
#+end_src
#+RESULTS:
: bread 2 kg spaghetti 20 cm milk 50 dl
-
+
** Bash shell: support for associative arrays with lists
Bash will see an associative array that contains each row as a single
string. Bash cannot handle lists in associative arrays.
@@ -85,4 +85,3 @@ echo ${table[spaghetti]}
#+RESULTS:
: 20 cm
-
diff --git a/testing/lisp/test-ob-exp.el b/testing/lisp/test-ob-exp.el
index 4669c55..940f2d6 100644
--- a/testing/lisp/test-ob-exp.el
+++ b/testing/lisp/test-ob-exp.el
@@ -1,6 +1,6 @@
;;; test-ob-exp.el
-;; Copyright (c) 2010-2014 Eric Schulte
+;; Copyright (c) 2010-2015 Eric Schulte
;; Authors: Eric Schulte
;; This file is not part of GNU Emacs.
@@ -239,11 +239,11 @@ Here is one at the end of a line. =2=
(should
(string-match
(replace-regexp-in-string
- "\\\\\\[]{" "\\(?:\\[]\\)?{" ;accept both src_sh[]{...} or src_sh{...}
- (regexp-quote "Here is one in the middle src_sh[]{echo 1} of a line.
-Here is one at the end of a line. src_sh[]{echo 2}
-src_sh[]{echo 3} Here is one at the beginning of a line.
-Here is one that is also evaluated: src_sh[]{echo 4} =4=")
+ "\\\\\\[]{" "\\(?:\\[]\\)?{" ;accept both src_shell[]{...} or src_shell{...}
+ (regexp-quote "Here is one in the middle src_shell[]{echo 1} of a line.
+Here is one at the end of a line. src_shell[]{echo 2}
+src_shell[]{echo 3} Here is one at the beginning of a line.
+Here is one that is also evaluated: src_shell[]{echo 4} =4=")
nil t)
(org-test-at-id "cd54fc88-1b6b-45b6-8511-4d8fa7fc8076"
(org-narrow-to-subtree)
diff --git a/testing/lisp/test-ob.el b/testing/lisp/test-ob.el
index efde99a..48ffad2 100644
--- a/testing/lisp/test-ob.el
+++ b/testing/lisp/test-ob.el
@@ -1,6 +1,6 @@
;;; test-ob.el --- tests for ob.el
-;; Copyright (c) 2010-2014 Eric Schulte
+;; Copyright (c) 2010-2015 Eric Schulte
;; Authors: Eric Schulte, Martyn Jago
;; This file is not part of GNU Emacs.
@@ -269,7 +269,7 @@ this is simple"
(ert-deftest test-org-babel/org-babel-get-inline-src-block-matches ()
(flet ((test-at-id (id)
- (org-test-at-id
+ (org-test-at-id
id
(let ((test-point (point)))
(should (fboundp 'org-babel-get-inline-src-block-matches))
@@ -294,7 +294,7 @@ this is simple"
(test-at-id "d55dada7-de0e-4340-8061-787cccbedee5")))
(ert-deftest test-org-babel/inline-src_blk-default-results-replace-line-1 ()
- (let ((test-line "src_sh{echo 1}"))
+ (let ((test-line "src_shell{echo 1}"))
;; src_ at bol line 1...
(org-test-with-temp-text
test-line
@@ -468,14 +468,14 @@ this is simple"
(ert-deftest test-org-babel/combining-scalar-and-raw-result-types ()
(org-test-with-temp-text-in-file "
-#+begin_src sh :results scalar
+#+begin_src shell :results scalar
echo \"[[file:./cv.cls]]\"
#+end_src
#+name:
: [[file:./cv.cls]]
-#+begin_src sh :results raw scalar
+#+begin_src shell :results raw scalar
echo \"[[file:./cv.cls]]\"
#+end_src
"
@@ -506,7 +506,7 @@ echo \"[[file:./cv.cls]]\"
(ert-deftest test-org-babel/just-one-results-block ()
"Test that evaluating two times the same code block does not result in a
duplicate results block."
- (org-test-with-temp-text "#+begin_src sh\necho Hello\n#+end_src\n"
+ (org-test-with-temp-text "#+begin_src shell\necho Hello\n#+end_src\n"
(org-babel-execute-src-block)
(org-babel-execute-src-block) ; second code block execution
(should (search-forward "Hello")) ; the string inside the source code block
@@ -666,27 +666,27 @@ on two lines
(check-eval "no-export" nil))))
(ert-deftest test-ob/noweb-expansion-1 ()
- (org-test-with-temp-text "#+begin_src sh :results output :tangle yes
+ (org-test-with-temp-text "#+begin_src shell :results output :tangle yes
<<foo>>
#+end_src
#+name: foo
-#+begin_src sh
+#+begin_src shell
bar
#+end_src"
(should (string= (org-babel-expand-noweb-references) "bar"))))
(ert-deftest test-ob/noweb-expansion-2 ()
- (org-test-with-temp-text "#+begin_src sh :results output :tangle yes
+ (org-test-with-temp-text "#+begin_src shell :results output :tangle yes
<<foo>>
#+end_src
#+name: foo
-#+begin_src sh :noweb-sep \"\"
+#+begin_src shell :noweb-sep \"\"
bar
#+end_src
-#+begin_src sh :noweb-ref foo :noweb-sep \"\"
+#+begin_src shell :noweb-ref foo :noweb-sep \"\"
baz
#+end_src"
(should (string= (org-babel-expand-noweb-references) "barbaz"))))
@@ -809,7 +809,7 @@ If not inserted correctly then the second evaluation will fail
trying to find the :END: marker."
(org-test-with-temp-text
"- indented
- #+begin_src sh :results file wrap
+ #+begin_src shell :results file wrap
echo test.txt
#+end_src"
(org-babel-next-src-block 1)
@@ -1137,7 +1137,7 @@ Paragraph"
| 1 | bar |
| 2 | baz |
-#+begin_src sh :var data=input-table :exports results :colnames '(Rev Author)
+#+begin_src shell :var data=input-table :exports results :colnames '(Rev Author)
echo \"$data\"
#+end_src
@@ -1155,7 +1155,7 @@ echo \"$data\"
| 1 | bar |
| 2 | baz |
-#+begin_src sh :var data=input-table :exports results :colnames '(Rev Author)
+#+begin_src shell :var data=input-table :exports results :colnames '(Rev Author)
echo \"$data\"
#+end_src
"
--
2.1.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: 63 failures for org-test-run-all-tests in an Emacs GUI
2015-01-09 21:01 ` Sebastien Vauban
@ 2015-01-10 10:17 ` Nicolas Goaziou
2015-01-23 15:42 ` Sebastien Vauban
0 siblings, 1 reply; 22+ messages in thread
From: Nicolas Goaziou @ 2015-01-10 10:17 UTC (permalink / raw)
To: Org Mode List
Sebastien Vauban <sva-news-D0wtAvR13HarG/iDocfnWg@public.gmane.org>
writes:
> Nicolas Goaziou wrote:
>> Sebastien Vauban writes:
>>
>>> Did I misunderstand the change of last year (Dec '13) or should `sh'
>>> language be abandoned in favor of `shell'?
>>
>> I think you're right.
>>
>>> IIUC, then, those blocks should be updated: ...
>>> And those inline calls as well: ...
>>> I am willing to make the patch.
>>
>> Great. Please do.
>
> Here it is.
Thanks.
Unfortunately, I'm still unable to apply your patch. Before using "git
format-patch", please ensure that your patch is the only one on top of
HEAD, and send it again.
If you already did, maybe someone else with write access to the repo
will be able to sort it out.
Regards,
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH] Replace `org-ctrl-c-ctrl-c' by `org-babel-execute-maybe' in tests
2015-01-03 10:56 ` Nicolas Goaziou
@ 2015-01-23 15:05 ` Sebastien Vauban
2015-01-23 23:14 ` Nicolas Goaziou
0 siblings, 1 reply; 22+ messages in thread
From: Sebastien Vauban @ 2015-01-23 15:05 UTC (permalink / raw)
To: emacs-orgmode-mXXj517/zsQ
[-- Attachment #1: Type: text/plain, Size: 725 bytes --]
Nicolas Goaziou wrote:
> Sebastien Vauban writes:
>
>>> Could you use git format-patch instead?
>>
>> Of course. Sorry. Here it is.
>
> I still cannot apply it. It may be related to a whitespace change in
> "test-ob.el":
>
> Application : Replace `org-ctrl-c-ctrl-c' by `org-babel-execute-maybe' in tests
> error: le patch a échoué : testing/lisp/test-ob.el:269
> error: testing/lisp/test-ob.el : le patch ne s'applique pas
Attached a patch that I certify working -- I've applied it myself with
success on a current master clone.
I still don't understand why the previous one did not work (SPC vs TAB
or something like that, same guess as you).
Best regards,
Seb
--
Sebastien Vauban
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Replace-org-ctrl-c-ctrl-c-by-org-babel-execute-maybe.patch --]
[-- Type: text/x-patch, Size: 14057 bytes --]
From 82c1f3bc268a856e6d20250c028157ede33528d7 Mon Sep 17 00:00:00 2001
From: Sebastien Vauban <sva-news-D0wtAvR13HarG/iDocfnWg@public.gmane.org>
Date: Fri, 23 Jan 2015 15:47:43 +0100
Subject: [PATCH] Replace `org-ctrl-c-ctrl-c' by `org-babel-execute-maybe'
* testing/lisp/test-ob-emacs-lisp.el, test-ob-ruby.el, test-ob.el: Replace `org-ctrl-c-ctrl-c' by `org-babel-execute-maybe'.
---
testing/lisp/test-ob-emacs-lisp.el | 10 ++---
testing/lisp/test-ob-ruby.el | 8 ++--
testing/lisp/test-ob.el | 88 +++++++++++++++++++-------------------
3 files changed, 53 insertions(+), 53 deletions(-)
diff --git a/testing/lisp/test-ob-emacs-lisp.el b/testing/lisp/test-ob-emacs-lisp.el
index f771ee3..37d52a6 100644
--- a/testing/lisp/test-ob-emacs-lisp.el
+++ b/testing/lisp/test-ob-emacs-lisp.el
@@ -1,6 +1,6 @@
;;; test-ob-emacs-lisp.el
-;; Copyright (c) 2012, 2013, 2014 Free Software Foundation, Inc.
+;; Copyright (c) 2012-2015 Free Software Foundation, Inc.
;; Authors: Eric Schulte, Martyn Jago
;; This file is not part of GNU Emacs.
@@ -29,7 +29,7 @@
;;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (re-search-forward "results:" nil t))
(forward-line)
(should
@@ -42,7 +42,7 @@
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (re-search-forward "results:" nil t))
(forward-line)
(should
@@ -56,7 +56,7 @@
;;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(re-search-forward "results" nil t)
(forward-line)
(should (string=
@@ -69,7 +69,7 @@
2;;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(re-search-forward "results" nil t)
(forward-line)
(should (string=
diff --git a/testing/lisp/test-ob-ruby.el b/testing/lisp/test-ob-ruby.el
index ee7e837..eb5233b 100644
--- a/testing/lisp/test-ob-ruby.el
+++ b/testing/lisp/test-ob-ruby.el
@@ -1,6 +1,6 @@
;;; test-ob-ruby.el --- tests for ob-ruby.el
-;; Copyright (c) 2013 Oleh Krehel
+;; Copyright (c) 2013-2015 Oleh Krehel
;; Authors: Oleh Krehel
;; This program is free software; you can redistribute it and/or modify
@@ -28,7 +28,7 @@ s = \"2\"
s = \"3\"
puts s
#+end_src"
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(substring-no-properties
(buffer-string)))
"#+begin_src ruby :session :results output
@@ -47,7 +47,7 @@ puts s
s = \"5\"
puts s
#+end_src"
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(substring-no-properties
(buffer-string)))
"#+begin_src ruby :session :results output
@@ -63,7 +63,7 @@ puts s
(should (equal (org-test-with-temp-text "#+begin_src ruby :session :results output
puts s
#+end_src"
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(substring-no-properties
(buffer-string)))
"#+begin_src ruby :session :results output
diff --git a/testing/lisp/test-ob.el b/testing/lisp/test-ob.el
index 989c201..1f375ed 100644
--- a/testing/lisp/test-ob.el
+++ b/testing/lisp/test-ob.el
@@ -1,6 +1,6 @@
;;; test-ob.el --- tests for ob.el
-;; Copyright (c) 2010-2014 Eric Schulte
+;; Copyright (c) 2010-2015 Eric Schulte
;; Authors: Eric Schulte, Martyn Jago
;; This file is not part of GNU Emacs.
@@ -299,18 +299,18 @@ this is simple"
;; src_ at bol line 1...
(org-test-with-temp-text
test-line
- (goto-char (point-min)) (org-ctrl-c-ctrl-c)
+ (goto-char (point-min)) (org-babel-execute-maybe)
(should (string=
(concat test-line " =1=")
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))
- (forward-char) (org-ctrl-c-ctrl-c)
+ (forward-char) (org-babel-execute-maybe)
(should (string=
(concat test-line " =1= =1=")
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))
(re-search-forward "1}")
- (should-error (org-ctrl-c-ctrl-c))
+ (should-error (org-babel-execute-maybe))
(backward-char) ;; last char of block body
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (string=
(concat test-line " =1= =1= =1=")
(buffer-substring-no-properties (point-at-bol) (point-at-eol)))))
@@ -318,17 +318,17 @@ this is simple"
(let ((test-line " src_emacs-lisp{ 1 }"))
(org-test-with-temp-text
test-line
- (should-error (org-ctrl-c-ctrl-c))
- (forward-char) (org-ctrl-c-ctrl-c)
+ (should-error (org-babel-execute-maybe))
+ (forward-char) (org-babel-execute-maybe)
(should (string=
(concat test-line " =1=")
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))
- (re-search-forward "{ 1 ") (org-ctrl-c-ctrl-c)
+ (re-search-forward "{ 1 ") (org-babel-execute-maybe)
(should (string=
(concat test-line " =1= =1=")
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))
(forward-char)
- (should-error (org-ctrl-c-ctrl-c))))))
+ (should-error (org-babel-execute-maybe))))))
(ert-deftest test-org-babel/inline-src_blk-default-results-replace-line-2 ()
;; src_ at bol line 2...
@@ -336,12 +336,12 @@ this is simple"
(org-babel-inline-result-wrap "=%s="))
(org-test-with-temp-text
(concat "\n" test-line)
- (should-error (org-ctrl-c-ctrl-c))
+ (should-error (org-babel-execute-maybe))
(goto-char (point-min))
- (should-error (org-ctrl-c-ctrl-c))
+ (should-error (org-babel-execute-maybe))
(forward-line)
- (should-error (org-ctrl-c-ctrl-c))
- (forward-char) (org-ctrl-c-ctrl-c)
+ (should-error (org-babel-execute-maybe))
+ (forward-char) (org-babel-execute-maybe)
(should (string=
(concat test-line " =x=")
(buffer-substring-no-properties
@@ -353,28 +353,28 @@ this is simple"
test-line
(goto-char (point-max))
(insert (concat "\n" test-line " end"))
- (re-search-backward "src") (org-ctrl-c-ctrl-c)
+ (re-search-backward "src") (org-babel-execute-maybe)
(should (string=
(concat test-line " =y= end")
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))
- (re-search-forward "\" ") (org-ctrl-c-ctrl-c)
+ (re-search-forward "\" ") (org-babel-execute-maybe)
(should (string=
(concat test-line " =y= =y= end")
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))
(forward-char)
- (should-error (org-ctrl-c-ctrl-c)))))
+ (should-error (org-babel-execute-maybe)))))
(ert-deftest test-org-babel/inline-src_blk-manual-results-replace ()
(let ((test-line " src_emacs-lisp[:results replace]{ \"x\" }")
(org-babel-inline-result-wrap "=%s="))
(org-test-with-temp-text
(concat "\n" test-line)
- (should-error (org-ctrl-c-ctrl-c))
+ (should-error (org-babel-execute-maybe))
(goto-char (point-max))
- (should-error (org-ctrl-c-ctrl-c))
+ (should-error (org-babel-execute-maybe))
(beginning-of-line)
- (should-error (org-ctrl-c-ctrl-c))
- (forward-char) (org-ctrl-c-ctrl-c)
+ (should-error (org-babel-execute-maybe))
+ (forward-char) (org-babel-execute-maybe)
(should (string=
(concat test-line " =x=")
(buffer-substring-no-properties
@@ -386,68 +386,68 @@ this is simple"
(org-test-with-temp-text test-line
(goto-char (point-max))
(insert (concat "\n" test-line " end"))
- (re-search-backward "src") (org-ctrl-c-ctrl-c)
+ (re-search-backward "src") (org-babel-execute-maybe)
(should (string=
(concat test-line " =y= end")
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))
- (re-search-forward "\" ") (org-ctrl-c-ctrl-c)
+ (re-search-forward "\" ") (org-babel-execute-maybe)
(should (string=
(concat test-line " =y= =y= end")
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))
(forward-char)
- (should-error (org-ctrl-c-ctrl-c)))))
+ (should-error (org-babel-execute-maybe)))))
(ert-deftest test-org-babel/inline-src_blk-results-silent ()
(let ((test-line "src_emacs-lisp[ :results silent ]{ \"x\" }"))
(org-test-with-temp-text test-line
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (string= test-line
(buffer-substring-no-properties
(point-at-bol) (point-at-eol))))
(end-of-buffer)
- (should-error (org-ctrl-c-ctrl-c))))
+ (should-error (org-babel-execute-maybe))))
(let ((test-line (concat " Some text prior to block src_emacs-lisp"
"[ :results silent ]{ \"y\" }")))
(org-test-with-temp-text
test-line
(goto-char (point-max))
(insert (concat "\n" test-line " end"))
- (re-search-backward "src_") (org-ctrl-c-ctrl-c)
+ (re-search-backward "src_") (org-babel-execute-maybe)
(should (string= (concat test-line " end")
(buffer-substring-no-properties
(point-at-bol) (point-at-eol))))
- (re-search-forward "\" ") (org-ctrl-c-ctrl-c)
+ (re-search-forward "\" ") (org-babel-execute-maybe)
(should (string= (concat test-line " end")
(buffer-substring-no-properties
(point-at-bol) (point-at-eol))))
(forward-char)
- (should-error (org-ctrl-c-ctrl-c)))))
+ (should-error (org-babel-execute-maybe)))))
(ert-deftest test-org-babel/inline-src_blk-results-raw ()
(let ((test-line "src_emacs-lisp[ :results raw ]{ \"x\" }"))
(org-test-with-temp-text test-line
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (string= (concat test-line " x")
(buffer-string)))))
(let ((test-line (concat " Some text prior to block "
"src_emacs-lisp[ :results raw ]{ \"the\" }")))
(org-test-with-temp-text (concat test-line " end")
- (re-search-forward "src_") (org-ctrl-c-ctrl-c)
+ (re-search-forward "src_") (org-babel-execute-maybe)
(should (string= (concat test-line " the end")
(buffer-substring-no-properties
(point-at-bol) (point-at-eol))))
- (re-search-forward "\" ") (org-ctrl-c-ctrl-c)
+ (re-search-forward "\" ") (org-babel-execute-maybe)
(should (string= (concat test-line " the the end")
(buffer-substring-no-properties
(point-at-bol) (point-at-eol))))
(forward-char)
- (should-error (org-ctrl-c-ctrl-c)))))
+ (should-error (org-babel-execute-maybe)))))
(ert-deftest test-org-babel/inline-src_blk-results-file ()
(let ((test-line "src_emacs-lisp[ :results file ]{ \"~/test-file\" }"))
(org-test-with-temp-text
test-line
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (string= (concat test-line " [[file:~/test-file]]")
(buffer-substring-no-properties
(point-min) (point-max)))))))
@@ -457,7 +457,7 @@ this is simple"
(org-babel-inline-result-wrap "=%s="))
(org-test-with-temp-text
test-line
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (string= (concat test-line " =\"x\"=")
(buffer-substring-no-properties
(point-min) (point-max)))))))
@@ -467,7 +467,7 @@ this is simple"
(org-babel-inline-result-wrap "=%s="))
(org-test-with-temp-text
test-line
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (string= (concat test-line " =\"x\"=")
(buffer-substring-no-properties
(point-min) (point-max)))))))
@@ -717,7 +717,7 @@ on two lines
;;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (re-search-forward "\\#\\+results:" nil t))
(forward-line)
(should
@@ -729,7 +729,7 @@ on two lines
\"some text\";;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (re-search-forward "\\#\\+results:" nil t))
(forward-line)
(should
@@ -743,7 +743,7 @@ on two lines
;;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(re-search-forward "\\#\\+results:" nil t)
(forward-line)
(should (string=
@@ -754,7 +754,7 @@ on two lines
2;;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(re-search-forward "\\#\\+results:" nil t)
(forward-line)
(should (string=
@@ -770,7 +770,7 @@ The block is actually executed /twice/ to ensure result
replacement happens correctly."
(org-test-with-temp-text
buffer-text
- (org-babel-next-src-block) (org-ctrl-c-ctrl-c) (org-ctrl-c-ctrl-c)
+ (org-babel-next-src-block) (org-babel-execute-maybe) (org-babel-execute-maybe)
(should (re-search-forward "\\#\\+results:" nil t))
(forward-line)
(should (string= result
@@ -857,7 +857,7 @@ trying to find the :END: marker."
(org-test-with-temp-text
test-line
(forward-char 1)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (re-search-forward "=\"x\"=" nil t))
(forward-line))))
@@ -867,7 +867,7 @@ trying to find the :END: marker."
;;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(re-search-forward "\\#\\+results:" nil t)
(forward-line)
(should (string=
@@ -878,7 +878,7 @@ trying to find the :END: marker."
2;;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(re-search-forward "\\#\\+results:" nil t)
(forward-line)
(should (string=
@@ -894,7 +894,7 @@ The block is actually executed /twice/ to ensure result
replacement happens correctly."
(org-test-with-temp-text
buffer-text
- (org-babel-next-src-block) (org-ctrl-c-ctrl-c) (org-ctrl-c-ctrl-c)
+ (org-babel-next-src-block) (org-babel-execute-maybe) (org-babel-execute-maybe)
(should (re-search-forward "\\#\\+results:" nil t))
(forward-line)
(should (string= result
--
2.1.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: 63 failures for org-test-run-all-tests in an Emacs GUI
2015-01-10 10:17 ` Nicolas Goaziou
@ 2015-01-23 15:42 ` Sebastien Vauban
2015-01-23 23:15 ` Nicolas Goaziou
0 siblings, 1 reply; 22+ messages in thread
From: Sebastien Vauban @ 2015-01-23 15:42 UTC (permalink / raw)
To: emacs-orgmode-mXXj517/zsQ
[-- Attachment #1: Type: text/plain, Size: 1399 bytes --]
Nicolas Goaziou wrote:
> Sebastien Vauban writes:
>> Nicolas Goaziou wrote:
>>> Sebastien Vauban writes:
>>>
>>>> Did I misunderstand the change of last year (Dec '13) or should `sh'
>>>> language be abandoned in favor of `shell'?
>>>
>>> I think you're right.
>>>
>>>> IIUC, then, those blocks should be updated: ...
>>>> And those inline calls as well: ...
>>>> I am willing to make the patch.
>>>
>>> Great. Please do.
>>
>> Here it is.
>
> Thanks.
>
> Unfortunately, I'm still unable to apply your patch. Before using "git
> format-patch", please ensure that your patch is the only one on top of
> HEAD, and send it again.
Here is a patch you can apply with no problem -- just checked it on
a fresh copy of master.
And you know what? I've understood the problem: when editing the *patch
file* to include the results of `C-x 4 a', and *saving* it, all the
trailing spaces *in the patch file* are removed, because of my custom:
#+begin_src emacs-lisp
(add-hook 'before-save-hook (lambda ()
;; Nuke all trailing whitespaces in the
;; buffer.
(unless (eq major-mode 'message-mode)
(delete-trailing-whitespace))))
#+end_src
Hence, Git fails to find some of the lines it searches for, when trying
to apply my changes...
Best regards,
Seb
--
Sebastien Vauban
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Replace-sh-language-by-shell.patch --]
[-- Type: text/x-patch, Size: 12642 bytes --]
From 744facc265a7fc3808d8af1438c2393be9168ef4 Mon Sep 17 00:00:00 2001
From: Sebastien Vauban <sva-news-D0wtAvR13HarG/iDocfnWg@public.gmane.org>
Date: Fri, 23 Jan 2015 16:13:16 +0100
Subject: [PATCH] Replace `sh' language by `shell'
* testing/README, testing/examples/babel.org, ob-shell-test.org, testing/lisp/test-ob-exp.el, test-ob.el: Replace `sh' language by `shell'.
---
testing/README | 2 +-
testing/examples/babel.org | 54 +++++++++++++++++++-------------------
testing/examples/ob-shell-test.org | 11 ++++----
testing/lisp/test-ob-exp.el | 12 ++++-----
testing/lisp/test-ob.el | 24 ++++++++---------
5 files changed, 51 insertions(+), 52 deletions(-)
diff --git a/testing/README b/testing/README
index 34f6fcd..d8a31ac 100644
--- a/testing/README
+++ b/testing/README
@@ -17,7 +17,7 @@ relative to the base of the Org-mode directory.
Also note that many of the current tests uses babel evaluation...
-#+BEGIN_SRC sh :dir (expand-file-name "..")
+#+BEGIN_SRC shell :dir (expand-file-name "..")
# For Emacs earlier than 24, add -L /path/to/ert
emacs -Q --batch \
-L lisp/ -L testing/ -L testing/lisp -l lisp/org.el \
diff --git a/testing/examples/babel.org b/testing/examples/babel.org
index 1f9ce3d..7bdc2ff 100644
--- a/testing/examples/babel.org
+++ b/testing/examples/babel.org
@@ -125,7 +125,7 @@
(list (my-map 'list #'+
(append prev-row '(0))
(append '(0) prev-row)))))))
-
+
(pascals-triangle n)
#+end_src
@@ -196,9 +196,9 @@ an = sign.
:results: silent
:ID: 54cb8dc3-298c-4883-a933-029b3c9d4b18
:END:
-Here is one in the middle src_sh{echo 1} of a line.
-Here is one at the end of a line. src_sh{echo 2}
-src_sh{echo 3} Here is one at the beginning of a line.
+Here is one in the middle src_shell{echo 1} of a line.
+Here is one at the end of a line. src_shell{echo 2}
+src_shell{echo 3} Here is one at the beginning of a line.
* exported inline source block
:PROPERTIES:
@@ -206,10 +206,10 @@ src_sh{echo 3} Here is one at the beginning of a line.
:results: silent
:exports: code
:END:
-Here is one in the middle src_sh{echo 1} of a line.
-Here is one at the end of a line. src_sh{echo 2}
-src_sh{echo 3} Here is one at the beginning of a line.
-Here is one that is also evaluated: src_sh[:exports both]{echo 4}
+Here is one in the middle src_shell{echo 1} of a line.
+Here is one at the end of a line. src_shell{echo 2}
+src_shell{echo 3} Here is one at the beginning of a line.
+Here is one that is also evaluated: src_shell[:exports both]{echo 4}
* mixed blocks with exports both
:PROPERTIES:
@@ -235,27 +235,27 @@ Here is one that is also evaluated: src_sh[:exports both]{echo 4}
:noweb-sep: ""
:END:
-#+begin_src sh :tangle yes :noweb yes :shebang "#!/bin/sh"
+#+begin_src shell :tangle yes :noweb yes :shebang "#!/bin/sh"
<<fullest-disk>>
#+end_src
** query all mounted disks
-#+begin_src sh :noweb-ref fullest-disk
+#+begin_src shell :noweb-ref fullest-disk
df
#+end_src
** strip the header row
-#+begin_src sh :noweb-ref fullest-disk
+#+begin_src shell :noweb-ref fullest-disk
|sed '1d'
#+end_src
** sort by the percent full
-#+begin_src sh :noweb-ref fullest-disk
+#+begin_src shell :noweb-ref fullest-disk
|awk '{print $5 " " $6}'|sort -n |tail -1
#+end_src
** extract the mount point
-#+begin_src sh :noweb-ref fullest-disk
+#+begin_src shell :noweb-ref fullest-disk
|awk '{print $2}'
#+end_src
* resolving sub-trees as references
@@ -290,20 +290,20 @@ has length 14
:results: silent
:ID: 0D0983D4-DE33-400A-8A05-A225A567BC74
:END:
-src_sh{echo "One"} block at start of line
- One spaced block in src_sh{ echo "middle" } of line
-src_sh{echo 2} blocks on the src_emacs-lisp{"same"} line
- Inline block with src_sh[:results silent]{ echo "parameters" }.
+src_shell{echo "One"} block at start of line
+ One spaced block in src_shell{ echo "middle" } of line
+src_shell{echo 2} blocks on the src_emacs-lisp{"same"} line
+ Inline block with src_shell[:results silent]{ echo "parameters" }.
* org-babel-get-inline-src-block-matches (with empty args)
:PROPERTIES:
:results: silent
:ID: d55dada7-de0e-4340-8061-787cccbedee5
:END:
-src_sh[]{echo "One"} block at start of line
- One spaced block in src_sh[]{ echo "middle" } of line
-src_sh[]{echo 2} blocks on the src_emacs-lisp[]{"same"} line
- Inline block with src_sh[:results silent]{ echo "parameters" }.
+src_shell[]{echo "One"} block at start of line
+ One spaced block in src_shell[]{ echo "middle" } of line
+src_shell[]{echo 2} blocks on the src_emacs-lisp[]{"same"} line
+ Inline block with src_shell[:results silent]{ echo "parameters" }.
* exporting a code block with a name
:PROPERTIES:
@@ -312,7 +312,7 @@ src_sh[]{echo 2} blocks on the src_emacs-lisp[]{"same"} line
exporting a code block with a name
#+name: qux
-#+begin_src sh :foo "baz"
+#+begin_src shell :foo "baz"
echo bar
#+end_src
* noweb no-export and exports both
@@ -324,13 +324,13 @@ Weird interaction.
here is one block
#+name: noweb-no-export-and-exports-both-1
-#+BEGIN_SRC sh :exports none
+#+BEGIN_SRC shell :exports none
echo 1
#+END_SRC
and another
-#+BEGIN_SRC sh :noweb no-export :exports both
+#+BEGIN_SRC shell :noweb no-export :exports both
# I am inside the code block
<<noweb-no-export-and-exports-both-1>>
#+END_SRC
@@ -373,11 +373,11 @@ Here is a call line with more than just the results exported.
:END:
#+name: strip-export-1
-#+BEGIN_SRC sh :exports none
+#+BEGIN_SRC shell :exports none
i="10"
#+END_SRC
-#+BEGIN_SRC sh :noweb strip-export :exports code :results silent
+#+BEGIN_SRC shell :noweb strip-export :exports code :results silent
<<strip-export-1>>
echo "1$i"
#+END_SRC
@@ -444,7 +444,7 @@ comments for ":var":
#+HEADER: :var c=(or (org-entry-get org-babel-current-src-block-location "c" t) "0")
#+HEADER: :var d=(or (org-entry-get org-babel-current-src-block-location "d" t) "0")
#+HEADER: :var e=(or (org-entry-get org-babel-current-src-block-location "e" t) "0")
-#+BEGIN_SRC sh :shebang #!/bin/sh :exports results :results verbatim
+#+BEGIN_SRC shell :shebang #!/bin/sh :exports results :results verbatim
printf "shell a:$a, b:$b, c:$c, d:$d, e:$e"
#+END_SRC
diff --git a/testing/examples/ob-shell-test.org b/testing/examples/ob-shell-test.org
index a54e5c0..ce4ae79 100644
--- a/testing/examples/ob-shell-test.org
+++ b/testing/examples/ob-shell-test.org
@@ -22,7 +22,7 @@
:ID: 0ba56632-8dc1-405c-a083-c204bae477cf
:END:
** Generic shell: no arrays
-#+begin_src sh :exports results :var array=sample_array
+#+begin_src shell :exports results :var array=sample_array
echo ${array}
#+end_src
@@ -32,7 +32,7 @@ echo ${array}
** Bash shell: support for arrays
Bash will see a simple indexed array. In this test, we check that the
returned value is indeed only the first item of the array, as opposed to
-the generic serialiation that will return all elements of the array as
+the generic serialiation that will return all elements of the array as
a single string.
#+begin_src bash :exports results :var array=sample_array
echo ${array}
@@ -47,7 +47,7 @@ echo ${array}
:END:
** Generic shell: no special handing
The shell will see all values as a single string.
-#+begin_src sh :exports results :var table=sample_mapping_table
+#+begin_src shell :exports results :var table=sample_mapping_table
echo ${table}
#+end_src
@@ -69,13 +69,13 @@ echo ${table[second]}
:ID: 82320a48-3409-49d7-85c9-5de1c6d3ff87
:END:
** Generic shell: no special handing
-#+begin_src sh :exports results :var table=sample_big_table
+#+begin_src shell :exports results :var table=sample_big_table
echo ${table}
#+end_src
#+RESULTS:
: bread 2 kg spaghetti 20 cm milk 50 dl
-
+
** Bash shell: support for associative arrays with lists
Bash will see an associative array that contains each row as a single
string. Bash cannot handle lists in associative arrays.
@@ -85,4 +85,3 @@ echo ${table[spaghetti]}
#+RESULTS:
: 20 cm
-
diff --git a/testing/lisp/test-ob-exp.el b/testing/lisp/test-ob-exp.el
index 9a586f2..aec4588 100644
--- a/testing/lisp/test-ob-exp.el
+++ b/testing/lisp/test-ob-exp.el
@@ -1,6 +1,6 @@
;;; test-ob-exp.el
-;; Copyright (c) 2010-2014 Eric Schulte
+;; Copyright (c) 2010-2015 Eric Schulte
;; Authors: Eric Schulte
;; This file is not part of GNU Emacs.
@@ -242,11 +242,11 @@ Here is one at the end of a line. =2=
(should
(string-match
(replace-regexp-in-string
- "\\\\\\[]{" "\\(?:\\[]\\)?{" ;accept both src_sh[]{...} or src_sh{...}
- (regexp-quote "Here is one in the middle src_sh[]{echo 1} of a line.
-Here is one at the end of a line. src_sh[]{echo 2}
-src_sh[]{echo 3} Here is one at the beginning of a line.
-Here is one that is also evaluated: src_sh[]{echo 4} =4=")
+ "\\\\\\[]{" "\\(?:\\[]\\)?{" ;accept both src_shell[]{...} or src_shell{...}
+ (regexp-quote "Here is one in the middle src_shell[]{echo 1} of a line.
+Here is one at the end of a line. src_shell[]{echo 2}
+src_shell[]{echo 3} Here is one at the beginning of a line.
+Here is one that is also evaluated: src_shell[]{echo 4} =4=")
nil t)
(org-test-at-id "cd54fc88-1b6b-45b6-8511-4d8fa7fc8076"
(org-narrow-to-subtree)
diff --git a/testing/lisp/test-ob.el b/testing/lisp/test-ob.el
index 1f375ed..1a35d5f 100644
--- a/testing/lisp/test-ob.el
+++ b/testing/lisp/test-ob.el
@@ -294,7 +294,7 @@ this is simple"
(test-at-id "d55dada7-de0e-4340-8061-787cccbedee5")))
(ert-deftest test-org-babel/inline-src_blk-default-results-replace-line-1 ()
- (let ((test-line "src_sh{echo 1}")
+ (let ((test-line "src_shell{echo 1}")
(org-babel-inline-result-wrap "=%s="))
;; src_ at bol line 1...
(org-test-with-temp-text
@@ -475,14 +475,14 @@ this is simple"
(ert-deftest test-org-babel/combining-scalar-and-raw-result-types ()
(org-test-with-temp-text-in-file "
-#+begin_src sh :results scalar
+#+begin_src shell :results scalar
echo \"[[file:./cv.cls]]\"
#+end_src
#+name:
: [[file:./cv.cls]]
-#+begin_src sh :results raw scalar
+#+begin_src shell :results raw scalar
echo \"[[file:./cv.cls]]\"
#+end_src
"
@@ -513,7 +513,7 @@ echo \"[[file:./cv.cls]]\"
(ert-deftest test-org-babel/just-one-results-block ()
"Test that evaluating two times the same code block does not result in a
duplicate results block."
- (org-test-with-temp-text "#+begin_src sh\necho Hello\n#+end_src\n"
+ (org-test-with-temp-text "#+begin_src shell\necho Hello\n#+end_src\n"
(org-babel-execute-src-block)
(org-babel-execute-src-block) ; second code block execution
(should (search-forward "Hello")) ; the string inside the source code block
@@ -673,27 +673,27 @@ on two lines
(check-eval "no-export" nil))))
(ert-deftest test-ob/noweb-expansion-1 ()
- (org-test-with-temp-text "#+begin_src sh :results output :tangle yes
+ (org-test-with-temp-text "#+begin_src shell :results output :tangle yes
<<foo>>
#+end_src
#+name: foo
-#+begin_src sh
+#+begin_src shell
bar
#+end_src"
(should (string= (org-babel-expand-noweb-references) "bar"))))
(ert-deftest test-ob/noweb-expansion-2 ()
- (org-test-with-temp-text "#+begin_src sh :results output :tangle yes
+ (org-test-with-temp-text "#+begin_src shell :results output :tangle yes
<<foo>>
#+end_src
#+name: foo
-#+begin_src sh :noweb-sep \"\"
+#+begin_src shell :noweb-sep \"\"
bar
#+end_src
-#+begin_src sh :noweb-ref foo :noweb-sep \"\"
+#+begin_src shell :noweb-ref foo :noweb-sep \"\"
baz
#+end_src"
(should (string= (org-babel-expand-noweb-references) "barbaz"))))
@@ -816,7 +816,7 @@ If not inserted correctly then the second evaluation will fail
trying to find the :END: marker."
(org-test-with-temp-text
"- indented
- #+begin_src sh :results file wrap
+ #+begin_src shell :results file wrap
echo test.txt
#+end_src"
(org-babel-next-src-block 1)
@@ -1145,7 +1145,7 @@ Paragraph"
| 1 | bar |
| 2 | baz |
-#+begin_src sh :var data=input-table :exports results :colnames '(Rev Author)
+#+begin_src shell :var data=input-table :exports results :colnames '(Rev Author)
echo \"$data\"
#+end_src
@@ -1163,7 +1163,7 @@ echo \"$data\"
| 1 | bar |
| 2 | baz |
-#+begin_src sh :var data=input-table :exports results :colnames '(Rev Author)
+#+begin_src shell :var data=input-table :exports results :colnames '(Rev Author)
echo \"$data\"
#+end_src
"
--
2.1.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [PATCH] Replace `org-ctrl-c-ctrl-c' by `org-babel-execute-maybe' in tests
2015-01-23 15:05 ` Sebastien Vauban
@ 2015-01-23 23:14 ` Nicolas Goaziou
2015-01-30 13:29 ` Sebastien Vauban
0 siblings, 1 reply; 22+ messages in thread
From: Nicolas Goaziou @ 2015-01-23 23:14 UTC (permalink / raw)
To: Sebastien Vauban; +Cc: public-emacs-orgmode-mXXj517/zsQ
Sebastien Vauban <sva-news-D0wtAvR13HarG/iDocfnWg@public.gmane.org>
writes:
> Attached a patch that I certify working -- I've applied it myself with
> success on a current master clone.
Thanks.
Good news is that I can apply it. Bad news is that some tests fail.
5 unexpected results:
FAILED test-org-babel/inline-src_blk-default-results-replace-line-1
FAILED test-org-babel/inline-src_blk-default-results-replace-line-2
FAILED test-org-babel/inline-src_blk-manual-results-replace
FAILED test-org-babel/inline-src_blk-results-raw
FAILED test-org-babel/inline-src_blk-results-silent
Could you look into it?
Regards,
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: 63 failures for org-test-run-all-tests in an Emacs GUI
2015-01-23 15:42 ` Sebastien Vauban
@ 2015-01-23 23:15 ` Nicolas Goaziou
[not found] ` <87ppa584wz.fsf-Gpy5sJQTEQHwkn9pgDnJRVAUjnlXr6A1@public.gmane.org>
0 siblings, 1 reply; 22+ messages in thread
From: Nicolas Goaziou @ 2015-01-23 23:15 UTC (permalink / raw)
To: Sebastien Vauban; +Cc: public-emacs-orgmode-mXXj517/zsQ
Sebastien Vauban <sva-news-D0wtAvR13HarG/iDocfnWg@public.gmane.org>
writes:
> Here is a patch you can apply with no problem -- just checked it on
> a fresh copy of master.
Thanks.
I can apply it but it introduces test failures.
FAILED ob-shell/generic-uses-no-arrays
FAILED ob-shell/generic-uses-no-assoc-arrays
FAILED ob-tangle/continued-code-blocks-w-noweb-ref
FAILED test-ob/specific-colnames
Could you look into it?
Regards,
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH] Replace `org-ctrl-c-ctrl-c' by `org-babel-execute-maybe' in tests
2015-01-23 23:14 ` Nicolas Goaziou
@ 2015-01-30 13:29 ` Sebastien Vauban
2015-01-30 17:30 ` Nicolas Goaziou
0 siblings, 1 reply; 22+ messages in thread
From: Sebastien Vauban @ 2015-01-30 13:29 UTC (permalink / raw)
To: emacs-orgmode-mXXj517/zsQ
[-- Attachment #1: Type: text/plain, Size: 826 bytes --]
Hello Nicolas,
Nicolas Goaziou wrote:
> Sebastien Vauban writes:
>
>> Attached a patch that I certify working -- I've applied it myself
>> with success on a current master clone.
>
> Thanks.
>
> Good news is that I can apply it. Bad news is that some tests fail.
>
> 5 unexpected results:
> FAILED test-org-babel/inline-src_blk-default-results-replace-line-1
> FAILED test-org-babel/inline-src_blk-default-results-replace-line-2
> FAILED test-org-babel/inline-src_blk-manual-results-replace
> FAILED test-org-babel/inline-src_blk-results-raw
> FAILED test-org-babel/inline-src_blk-results-silent
>
> Could you look into it?
DONE!
The lines `(should-error (org-ctrl-c-ctrl-c))' hadn't to be replaced,
that's all...
It now passes tests in a breeze.
Best regards,
Seb
--
Sebastien Vauban
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Replace-org-ctrl-c-ctrl-c-by-org-babel-execute-maybe.patch --]
[-- Type: text/x-patch, Size: 12678 bytes --]
From 2147c1ef85d7f8f8f4a3d54411e0891e4f006c82 Mon Sep 17 00:00:00 2001
From: Sebastien Vauban <sva-news-D0wtAvR13HarG/iDocfnWg@public.gmane.org>
Date: Fri, 30 Jan 2015 14:23:54 +0100
Subject: [PATCH] Replace `org-ctrl-c-ctrl-c' by `org-babel-execute-maybe'
* testing/lisp/test-ob-emacs-lisp.el, test-ob-ruby.el, test-ob.el: Replace `org-ctrl-c-ctrl-c' by `org-babel-execute-maybe'.
---
testing/lisp/test-ob-emacs-lisp.el | 10 +++---
testing/lisp/test-ob-ruby.el | 8 ++---
testing/lisp/test-ob.el | 62 +++++++++++++++++++-------------------
3 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/testing/lisp/test-ob-emacs-lisp.el b/testing/lisp/test-ob-emacs-lisp.el
index f771ee3..37d52a6 100644
--- a/testing/lisp/test-ob-emacs-lisp.el
+++ b/testing/lisp/test-ob-emacs-lisp.el
@@ -1,6 +1,6 @@
;;; test-ob-emacs-lisp.el
-;; Copyright (c) 2012, 2013, 2014 Free Software Foundation, Inc.
+;; Copyright (c) 2012-2015 Free Software Foundation, Inc.
;; Authors: Eric Schulte, Martyn Jago
;; This file is not part of GNU Emacs.
@@ -29,7 +29,7 @@
;;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (re-search-forward "results:" nil t))
(forward-line)
(should
@@ -42,7 +42,7 @@
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (re-search-forward "results:" nil t))
(forward-line)
(should
@@ -56,7 +56,7 @@
;;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(re-search-forward "results" nil t)
(forward-line)
(should (string=
@@ -69,7 +69,7 @@
2;;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(re-search-forward "results" nil t)
(forward-line)
(should (string=
diff --git a/testing/lisp/test-ob-ruby.el b/testing/lisp/test-ob-ruby.el
index ee7e837..eb5233b 100644
--- a/testing/lisp/test-ob-ruby.el
+++ b/testing/lisp/test-ob-ruby.el
@@ -1,6 +1,6 @@
;;; test-ob-ruby.el --- tests for ob-ruby.el
-;; Copyright (c) 2013 Oleh Krehel
+;; Copyright (c) 2013-2015 Oleh Krehel
;; Authors: Oleh Krehel
;; This program is free software; you can redistribute it and/or modify
@@ -28,7 +28,7 @@ s = \"2\"
s = \"3\"
puts s
#+end_src"
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(substring-no-properties
(buffer-string)))
"#+begin_src ruby :session :results output
@@ -47,7 +47,7 @@ puts s
s = \"5\"
puts s
#+end_src"
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(substring-no-properties
(buffer-string)))
"#+begin_src ruby :session :results output
@@ -63,7 +63,7 @@ puts s
(should (equal (org-test-with-temp-text "#+begin_src ruby :session :results output
puts s
#+end_src"
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(substring-no-properties
(buffer-string)))
"#+begin_src ruby :session :results output
diff --git a/testing/lisp/test-ob.el b/testing/lisp/test-ob.el
index a7e2fbe..3051990 100644
--- a/testing/lisp/test-ob.el
+++ b/testing/lisp/test-ob.el
@@ -1,6 +1,6 @@
;;; test-ob.el --- tests for ob.el
-;; Copyright (c) 2010-2014 Eric Schulte
+;; Copyright (c) 2010-2015 Eric Schulte
;; Authors: Eric Schulte, Martyn Jago
;; This file is not part of GNU Emacs.
@@ -299,18 +299,18 @@ this is simple"
;; src_ at bol line 1...
(org-test-with-temp-text
test-line
- (goto-char (point-min)) (org-ctrl-c-ctrl-c)
+ (goto-char (point-min)) (org-babel-execute-maybe)
(should (string=
(concat test-line " {{{results(=1=)}}}")
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))
- (forward-char) (org-ctrl-c-ctrl-c)
+ (forward-char) (org-babel-execute-maybe)
(should (string=
(concat test-line " {{{results(=1=)}}}")
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))
(re-search-forward "{{{")
;;(should-error (org-ctrl-c-ctrl-c))
(backward-char 4) ;; last char of block body
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (string=
(concat test-line " {{{results(=1=)}}}")
(buffer-substring-no-properties (point-at-bol) (point-at-eol)))))
@@ -319,11 +319,11 @@ this is simple"
(org-test-with-temp-text
test-line
(should-error (org-ctrl-c-ctrl-c))
- (forward-char) (org-ctrl-c-ctrl-c)
+ (forward-char) (org-babel-execute-maybe)
(should (string=
(concat test-line " {{{results(=1=)}}}")
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))
- (re-search-forward "{ 1 ") (org-ctrl-c-ctrl-c)
+ (re-search-forward "{ 1 ") (org-babel-execute-maybe)
(should (string=
(concat test-line " {{{results(=1=)}}}")
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))
@@ -342,7 +342,7 @@ this is simple"
(should-error (org-ctrl-c-ctrl-c))
(forward-line)
(should-error (org-ctrl-c-ctrl-c))
- (forward-char) (org-ctrl-c-ctrl-c)
+ (forward-char) (org-babel-execute-maybe)
(should (string=
(concat test-line " {{{results(=x=)}}}")
(buffer-substring-no-properties
@@ -353,11 +353,11 @@ this is simple"
test-line
(goto-char (point-max))
(insert (concat "\n" test-line " end"))
- (re-search-backward "src") (org-ctrl-c-ctrl-c)
+ (re-search-backward "src") (org-babel-execute-maybe)
(should (string=
(concat test-line " {{{results(=y=)}}} end")
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))
- (re-search-forward "\" ") (org-ctrl-c-ctrl-c)
+ (re-search-forward "\" ") (org-babel-execute-maybe)
(should (string=
(concat test-line " {{{results(=y=)}}} end")
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))
@@ -371,10 +371,10 @@ this is simple"
(concat "\n" test-line)
(should-error (org-ctrl-c-ctrl-c))
(goto-char (point-max))
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(beginning-of-line)
(should-error (org-ctrl-c-ctrl-c))
- (forward-char) (org-ctrl-c-ctrl-c)
+ (forward-char) (org-babel-execute-maybe)
(should (string=
(concat test-line " {{{results(=x=)}}}")
(buffer-substring-no-properties
@@ -385,11 +385,11 @@ this is simple"
(org-test-with-temp-text test-line
(goto-char (point-max))
(insert (concat "\n" test-line " end"))
- (re-search-backward "src") (org-ctrl-c-ctrl-c)
+ (re-search-backward "src") (org-babel-execute-maybe)
(should (string=
(concat test-line " {{{results(=y=)}}} end")
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))
- (re-search-forward "\" ") (org-ctrl-c-ctrl-c)
+ (re-search-forward "\" ") (org-babel-execute-maybe)
(should (string=
(concat test-line " {{{results(=y=)}}} end")
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))
@@ -399,7 +399,7 @@ this is simple"
(ert-deftest test-org-babel/inline-src_blk-results-silent ()
(let ((test-line "src_emacs-lisp[ :results silent ]{ \"x\" }"))
(org-test-with-temp-text test-line
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (string= test-line
(buffer-substring-no-properties
(point-at-bol) (point-at-eol))))))
@@ -409,11 +409,11 @@ this is simple"
test-line
(goto-char (point-max))
(insert (concat "\n" test-line " end"))
- (re-search-backward "src_") (org-ctrl-c-ctrl-c)
+ (re-search-backward "src_") (org-babel-execute-maybe)
(should (string= (concat test-line " end")
(buffer-substring-no-properties
(point-at-bol) (point-at-eol))))
- (re-search-forward "\" ") (org-ctrl-c-ctrl-c)
+ (re-search-forward "\" ") (org-babel-execute-maybe)
(should (string= (concat test-line " end")
(buffer-substring-no-properties
(point-at-bol) (point-at-eol))))
@@ -423,17 +423,17 @@ this is simple"
(ert-deftest test-org-babel/inline-src_blk-results-raw ()
(let ((test-line "src_emacs-lisp[ :results raw ]{ \"x\" }"))
(org-test-with-temp-text test-line
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (string= (concat test-line " x")
(buffer-string)))))
(let ((test-line (concat " Some text prior to block "
"src_emacs-lisp[ :results raw ]{ \"the\" }")))
(org-test-with-temp-text (concat test-line " end")
- (re-search-forward "src_") (org-ctrl-c-ctrl-c)
+ (re-search-forward "src_") (org-babel-execute-maybe)
(should (string= (concat test-line " the end")
(buffer-substring-no-properties
(point-at-bol) (point-at-eol))))
- (re-search-forward "\" ") (org-ctrl-c-ctrl-c)
+ (re-search-forward "\" ") (org-babel-execute-maybe)
(should (string= (concat test-line " the the end")
(buffer-substring-no-properties
(point-at-bol) (point-at-eol))))
@@ -444,7 +444,7 @@ this is simple"
(let ((test-line "src_emacs-lisp[ :results file ]{ \"~/test-file\" }"))
(org-test-with-temp-text
test-line
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (string= (concat test-line " {{{results([[file:~/test-file]])}}}")
(buffer-substring-no-properties
(point-min) (point-max)))))))
@@ -454,7 +454,7 @@ this is simple"
(org-babel-inline-result-wrap "=%s="))
(org-test-with-temp-text
test-line
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (string= (concat test-line " {{{results(=\"x\"=)}}}")
(buffer-substring-no-properties
(point-min) (point-max)))))))
@@ -464,7 +464,7 @@ this is simple"
(org-babel-inline-result-wrap "=%s="))
(org-test-with-temp-text
test-line
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (string= (concat test-line " {{{results(=\"x\"=)}}}")
(buffer-substring-no-properties
(point-min) (point-max)))))))
@@ -714,7 +714,7 @@ on two lines
;;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (re-search-forward "\\#\\+results:" nil t))
(forward-line)
(should
@@ -726,7 +726,7 @@ on two lines
\"some text\";;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (re-search-forward "\\#\\+results:" nil t))
(forward-line)
(should
@@ -740,7 +740,7 @@ on two lines
;;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(re-search-forward "\\#\\+results:" nil t)
(forward-line)
(should (string=
@@ -751,7 +751,7 @@ on two lines
2;;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(re-search-forward "\\#\\+results:" nil t)
(forward-line)
(should (string=
@@ -767,7 +767,7 @@ The block is actually executed /twice/ to ensure result
replacement happens correctly."
(org-test-with-temp-text
buffer-text
- (org-babel-next-src-block) (org-ctrl-c-ctrl-c) (org-ctrl-c-ctrl-c)
+ (org-babel-next-src-block) (org-babel-execute-maybe) (org-babel-execute-maybe)
(should (re-search-forward "\\#\\+results:" nil t))
(forward-line)
(should (string= result
@@ -854,7 +854,7 @@ trying to find the :END: marker."
(org-test-with-temp-text
test-line
(forward-char 1)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(should (re-search-forward "=\"x\"=" nil t))
(forward-line))))
@@ -864,7 +864,7 @@ trying to find the :END: marker."
;;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(re-search-forward "\\#\\+results:" nil t)
(forward-line)
(should (string=
@@ -875,7 +875,7 @@ trying to find the :END: marker."
2;;
#+end_src"
(org-babel-next-src-block)
- (org-ctrl-c-ctrl-c)
+ (org-babel-execute-maybe)
(re-search-forward "\\#\\+results:" nil t)
(forward-line)
(should (string=
@@ -891,7 +891,7 @@ The block is actually executed /twice/ to ensure result
replacement happens correctly."
(org-test-with-temp-text
buffer-text
- (org-babel-next-src-block) (org-ctrl-c-ctrl-c) (org-ctrl-c-ctrl-c)
+ (org-babel-next-src-block) (org-babel-execute-maybe) (org-babel-execute-maybe)
(should (re-search-forward "\\#\\+results:" nil t))
(forward-line)
(should (string= result
--
2.1.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: 63 failures for org-test-run-all-tests in an Emacs GUI
[not found] ` <87ppa584wz.fsf-Gpy5sJQTEQHwkn9pgDnJRVAUjnlXr6A1@public.gmane.org>
@ 2015-01-30 14:09 ` Sebastien Vauban
0 siblings, 0 replies; 22+ messages in thread
From: Sebastien Vauban @ 2015-01-30 14:09 UTC (permalink / raw)
To: Nicolas Goaziou; +Cc: public-emacs-orgmode-mXXj517/zsQ-wOFGN7rlS/M9smdsby/KFg
Nicolas Goaziou wrote:
> Sebastien Vauban writes:
>
>> Here is a patch you can apply with no problem -- just checked it on
>> a fresh copy of master.
>
> Thanks.
>
> I can apply it but it introduces test failures.
>
> FAILED ob-shell/generic-uses-no-arrays
> FAILED ob-shell/generic-uses-no-assoc-arrays
> FAILED ob-tangle/continued-code-blocks-w-noweb-ref
> FAILED test-ob/specific-colnames
>
> Could you look into it?
I only see 3 problems right now (not `test-ob/specific-colnames'
anymore!?).
Regarding `ob-tangle/continued-code-blocks-w-noweb-ref', it's because
some `babel.shell' is now created (from a tangle operation) and is
inserted in the test in question:
┌────
│ (ert-deftest ob-tangle/continued-code-blocks-w-noweb-ref ()
│ "Test that the :noweb-ref header argument is used correctly."
│ (org-test-at-id "54d68d4b-1544-4745-85ab-4f03b3cbd8a0"
│ (let ((tangled
│ "df|sed '1d'|awk '{print $5 \" \" $6}'|sort -n |tail -1|awk '{print $2}'"))
│ (org-narrow-to-subtree)
│ (org-babel-tangle)
│ (with-temp-buffer
│ (insert-file-contents "babel.shell") ; <<<< was babel.sh
│ (goto-char (point-min))
│ (should (re-search-forward (regexp-quote tangled) nil t)))
│ (delete-file "babel.shell")))) ; <<<< was babel.sh
└────
Changing the file extension in the above test makes the problem
disappears, though I'm not sure it's the cleanest way to do it: the
shell block should be tangled to a file with the `sh' extension in the
first place, but why isn't it still the case?
Regarding `ob-shell/generic-uses-no-arrays' and
`ob-shell/generic-uses-no-assoc-arrays', they both make use of the code
block defined in the file `testing/examples/ob-shell-test.org':
┌────
│ * Array tests
│ :PROPERTIES:
│ :ID: 0ba56632-8dc1-405c-a083-c204bae477cf
│ :END:
│ ** Generic shell: no arrays
│ #+begin_src shell :exports results :var array=sample_array
│ # ^^^ was sh only
│ echo ${array}
│ #+end_src
└────
Still, I don't understand what's wrong in the tests, for example here
in `ob-shell/generic-uses-no-arrays':
┌────
│ ; A list of tests using the samples in ob-shell-test.org
│ (ert-deftest ob-shell/generic-uses-no-arrays ()
│ "No arrays for generic"
│ (org-test-at-id "0ba56632-8dc1-405c-a083-c204bae477cf"
│ (org-babel-next-src-block)
│ (should (equal "one two three" (org-babel-execute-src-block)))))
└────
Any hint?
PS- Two tests are defined under the same name:
--8<---------------cut here---------------start------------->8---
./test-ob-shell.el:63:(ert-deftest ob-shell/generic-uses-no-assoc-arrays ()
./test-ob-shell.el:76:(ert-deftest ob-shell/generic-uses-no-assoc-arrays ()
--8<---------------cut here---------------end--------------->8---
Isn't there any protection mechanism against test name duplicates?
Best regards,
Seb
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH] Replace `org-ctrl-c-ctrl-c' by `org-babel-execute-maybe' in tests
2015-01-30 13:29 ` Sebastien Vauban
@ 2015-01-30 17:30 ` Nicolas Goaziou
0 siblings, 0 replies; 22+ messages in thread
From: Nicolas Goaziou @ 2015-01-30 17:30 UTC (permalink / raw)
To: Sebastien Vauban; +Cc: public-emacs-orgmode-mXXj517/zsQ
Sebastien Vauban <sva-news-D0wtAvR13HarG/iDocfnWg@public.gmane.org>
writes:
> The lines `(should-error (org-ctrl-c-ctrl-c))' hadn't to be replaced,
> that's all...
>
> It now passes tests in a breeze.
Applied. Thank you.
Regards,
^ permalink raw reply [flat|nested] 22+ messages in thread
end of thread, other threads:[~2015-01-30 17:29 UTC | newest]
Thread overview: 22+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-22 15:45 63 failures for org-test-run-all-tests in an Emacs GUI Sebastien Vauban
2014-12-24 9:53 ` Nicolas Goaziou
2014-12-24 10:33 ` Sebastien Vauban
2014-12-24 12:39 ` Sebastien Vauban
2014-12-24 16:14 ` Nicolas Goaziou
[not found] ` <87egrp2ffk.fsf-Gpy5sJQTEQHwkn9pgDnJRVAUjnlXr6A1@public.gmane.org>
2014-12-29 16:06 ` [PATCH] Replace `org-ctrl-c-ctrl-c' by `org-babel-execute-maybe' in tests Sebastien Vauban
2014-12-30 8:53 ` Nicolas Goaziou
2014-12-30 11:32 ` Sebastien Vauban
2014-12-30 21:46 ` Nicolas Goaziou
[not found] ` <87y4polsjv.fsf-Gpy5sJQTEQHwkn9pgDnJRVAUjnlXr6A1@public.gmane.org>
2014-12-30 23:34 ` Sebastien Vauban
2015-01-03 10:56 ` Nicolas Goaziou
2015-01-23 15:05 ` Sebastien Vauban
2015-01-23 23:14 ` Nicolas Goaziou
2015-01-30 13:29 ` Sebastien Vauban
2015-01-30 17:30 ` Nicolas Goaziou
2014-12-31 9:25 ` 63 failures for org-test-run-all-tests in an Emacs GUI Sebastien Vauban
2015-01-03 10:57 ` Nicolas Goaziou
2015-01-09 21:01 ` Sebastien Vauban
2015-01-10 10:17 ` Nicolas Goaziou
2015-01-23 15:42 ` Sebastien Vauban
2015-01-23 23:15 ` Nicolas Goaziou
[not found] ` <87ppa584wz.fsf-Gpy5sJQTEQHwkn9pgDnJRVAUjnlXr6A1@public.gmane.org>
2015-01-30 14:09 ` Sebastien Vauban
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).