emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
05ee810a0af5c317f909b9d89229a5ace7fb260e blob 6517 bytes (raw)

  1
  2
  3
  4
  5
  6
  7
  8
  9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
 
;;; test-ob-shell.el

;; Copyright (c) 2010-2014, 2019 Eric Schulte
;; Authors: Eric Schulte

;; This file is not part of GNU Emacs.

;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.

;; This program is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
;; GNU General Public License for more details.

;; You should have received a copy of the GNU General Public License
;; along with this program.  If not, see <https://www.gnu.org/licenses/>.

;;; Comment:

;; Template test file for Org tests

;;; Code:
(org-test-for-executable "sh")
(unless (featurep 'ob-shell)
  (signal 'missing-test-dependency "Support for Shell code blocks"))

(ert-deftest test-ob-shell/dont-insert-spaces-on-expanded-bodies ()
  "Expanded shell bodies should not start with a blank line
unless the body of the tangled block does."
  (should-not (string-match "^[\n\r][\t ]*[\n\r]"
			    (org-babel-expand-body:generic "echo 2" '())))
  (should (string-match "^[\n\r][\t ]*[\n\r]"
			(org-babel-expand-body:generic "\n\necho 2" '()))))

(ert-deftest test-ob-shell/dont-error-on-empty-results ()
  "Was throwing an elisp error when shell blocks threw errors and
returned empty results."
  (should (null (org-babel-execute:sh "ls NoSuchFileOrDirectory.txt" nil))))

(ert-deftest test-ob-shell/session ()
  "This also tests `org-babel-comint-with-output' in
ob-comint.el, which was not previously tested."
  (let ((res (org-babel-execute:sh "echo 1; echo 2" '((:session . "yes")))))
    (should res)
    (should (listp res))))

; 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-trim (org-babel-execute-src-block))))))

(ert-deftest ob-shell/bash-uses-arrays ()
  "Bash arrays"
  (org-test-at-id "0ba56632-8dc1-405c-a083-c204bae477cf"
    (org-babel-next-src-block 2)
    (should (equal "one" (org-trim (org-babel-execute-src-block))))))

(ert-deftest ob-shell/generic-uses-no-assoc-arrays ()
  "No associative arrays for generic"
  (should
   (equal "first one second two third three"
	  (org-test-at-id
	   "bec1a5b0-4619-4450-a8c0-2a746b44bf8d"
	   (org-babel-next-src-block)
	   (org-trim (org-babel-execute-src-block)))))
  (should
   (equal "bread 2 kg spaghetti 20 cm milk 50 dl"
	  (org-test-at-id
	   "82320a48-3409-49d7-85c9-5de1c6d3ff87"
	   (org-babel-next-src-block)
	   (org-trim (org-babel-execute-src-block))))))

(ert-deftest ob-shell/bash-uses-assoc-arrays ()
  "Bash associative arrays"
  (should
   (equal "two"
	  (org-test-at-id
	   "bec1a5b0-4619-4450-a8c0-2a746b44bf8d"
	   (org-babel-next-src-block 2)
	   (org-trim (org-babel-execute-src-block)))))
  ;; Bash associative arrays as strings for the row.
  (should
   (equal "20 cm"
	  (org-test-at-id
	   "82320a48-3409-49d7-85c9-5de1c6d3ff87"
	   (org-babel-next-src-block 2)
	   (org-trim (org-babel-execute-src-block))))))

(ert-deftest ob-shell/simple-list ()
  "Test list variables in shell."
  ;; With bash, a list is turned into an array.
  (should
   (equal "2"
	  (org-test-with-temp-text
	   "#+BEGIN_SRC bash :results output :var l='(1 2)\necho ${l[1]}\n#+END_SRC"
	   (org-trim (org-babel-execute-src-block)))))
  ;; On sh, it is a string containing all values.
  (should
   (equal "1 2"
	  (org-test-with-temp-text
	   "#+BEGIN_SRC sh :results output :var l='(1 2)\necho ${l}\n#+END_SRC"
	   (org-trim (org-babel-execute-src-block))))))

(ert-deftest ob-shell/remote-with-stdin-or-cmdline ()
  "Test :stdin and :cmdline with a remote directory."
  ;; We assume 'default-directory' is a local directory.
  (dolist (spec `( ()
                   (:dir ,org-test-tramp-remote-dir)
                   (:dir ,org-test-tramp-remote-dir :cmdline t)
                   (:dir ,org-test-tramp-remote-dir :stdin   t)
                   (:dir ,org-test-tramp-remote-dir :cmdline t :shebang t)
                   (:dir ,org-test-tramp-remote-dir :stdin   t :shebang t)
                   (:dir ,org-test-tramp-remote-dir :cmdline t :stdin t :shebang t)
                   (:cmdline t)
                   (:stdin   t)
                   (:cmdline t :shebang t)
                   (:stdin   t :shebang t)
                   (:cmdline t :stdin t :shebang t)
                   ))
    (let ((default-directory (or (plist-get :dir spec) default-directory))
          (org-confirm-babel-evaluate nil)
          (params-line "")
          (who-line "  export who=tramp")
          (args-line "  echo ARGS: --verbose 23 71")
          )
      (when-let ((dir (plist-get :dir spec)))
        (setq params-line (concat params-line " " ":dir " dir)))
      (when (plist-get :stdin spec)
        (setq who-line "  read -r who")
        (setq params-line (concat params-line " :stdin input")))
      (when (plist-get :cmdline spec)
        (setq args-line "  echo \"ARGS: $*\"")
        (setq params-line (concat params-line " :cmdline \"--verbose 23 71\"")))
      (when (plist-get :shebang spec)
        (setq params-line (concat params-line " :shebang \"#!/bin/sh\"")))
      (let* ((result (org-test-with-temp-text
                         (mapconcat #'identity
                                    (list "#+name: input"
                                          "tramp"
                                          ""
                                          (concat "<point>"
                                                  "#+begin_src sh :results output " params-line)
                                          args-line
                                          who-line
                                          "  echo \"hello $who from $(pwd)/\""
                                          "#+end_src")
                                    "\n")
                       (org-trim (org-babel-execute-src-block))))
             (expected (concat "ARGS: --verbose 23 71"
                               "\nhello tramp from " (file-local-name default-directory)))
             (correct (equal result expected))
             )
        (should (equal result expected))
        ))))

(provide 'test-ob-shell)

;;; test-ob-shell.el ends here
debug log:

solving 05ee810a0 ...
found 05ee810a0 in https://list.orgmode.org/orgmode/E1o2dZt-0006wh-Gt@lists.gnu.org/
found 2f346f699 in https://git.savannah.gnu.org/cgit/emacs/org-mode.git
preparing index
index prepared:
100644 2f346f699e74577fa1a79fec4b6652c1efa10a6b	testing/lisp/test-ob-shell.el

applying [1/1] https://list.orgmode.org/orgmode/E1o2dZt-0006wh-Gt@lists.gnu.org/
diff --git a/testing/lisp/test-ob-shell.el b/testing/lisp/test-ob-shell.el
index 2f346f699..05ee810a0 100644

Checking patch testing/lisp/test-ob-shell.el...
Applied patch testing/lisp/test-ob-shell.el cleanly.

index at:
100644 05ee810a0af5c317f909b9d89229a5ace7fb260e	testing/lisp/test-ob-shell.el

Code repositories for project(s) associated with this 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).