forked from mirrors/org-mode
6e534f9c61
This fixes a wrong merge that should not have happened: commit 7e903a merges the master branch into the maint branch, while we really want to keep the maint branch a bugfix-only branch. This commit reverts back the maint branch to its state before merging the master branch. From there, we will fix remaining problems with the maint branch (e.g. copyright issues) then release this maint branch as Org-mode 7.8.05.
38 lines
1.1 KiB
EmacsLisp
38 lines
1.1 KiB
EmacsLisp
;;; test-ob-sh.el
|
||
|
||
;; Copyright (c) 2010 Eric Schulte
|
||
;; Authors: Eric Schulte
|
||
|
||
;; Released under the GNU General Public License version 3
|
||
;; see: http://www.gnu.org/licenses/gpl-3.0.html
|
||
|
||
;; Template test file for Org-mode tests
|
||
|
||
|
||
;;; Code:
|
||
(let ((load-path (cons (expand-file-name
|
||
".." (file-name-directory
|
||
(or load-file-name buffer-file-name)))
|
||
load-path)))
|
||
(require 'org-test)
|
||
(require 'org-test-ob-consts))
|
||
|
||
|
||
;;; Tests
|
||
(ert-deftest test-ob-sh/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-sh/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))))
|
||
|
||
(provide 'test-ob-sh)
|
||
|
||
;;; test-ob-sh.el ends here
|