From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bastien Subject: Re: [BUG] Testing fails after rename of ob-sh Date: Fri, 17 Jan 2014 14:29:48 +0100 Message-ID: <87ppnqpwhf.fsf@bzg.ath.cx> References: <20140116224305.GA45120@eyeBook> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:45963) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W49Uk-0001hV-1W for emacs-orgmode@gnu.org; Fri, 17 Jan 2014 08:30:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W49Uf-0007hK-93 for emacs-orgmode@gnu.org; Fri, 17 Jan 2014 08:29:57 -0500 Received: from mail-wg0-x235.google.com ([2a00:1450:400c:c00::235]:42221) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W49Ue-0007h8-V1 for emacs-orgmode@gnu.org; Fri, 17 Jan 2014 08:29:53 -0500 Received: by mail-wg0-f53.google.com with SMTP id y10so4422701wgg.8 for ; Fri, 17 Jan 2014 05:29:52 -0800 (PST) In-Reply-To: <20140116224305.GA45120@eyeBook> (Rick Frankel's message of "Thu, 16 Jan 2014 17:43:06 -0500") List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Rick Frankel Cc: emacs-orgmode@gnu.org, schulte.eric@gmail.com --=-=-= Content-Type: text/plain Hi Rick, Rick Frankel writes: > Eric- > > After doing a git pull including the rename of ob-sh.el to > ob-shell.el, testing fails with the error: > > Cannot open load file: no such file or directory, ob-sh The attached patch fixes it but I'll let Eric apply or amend it. --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=fix-ob-shell-tests.patch Changes in stash@{0}^2^..stash@{0} 3 files changed, 53 insertions(+), 53 deletions(-) testing/lisp/test-ob-sh.el | 52 ------------------------------------------- testing/lisp/test-ob-shell.el | 52 +++++++++++++++++++++++++++++++++++++++++++ testing/org-test.el | 2 +- Deleted testing/lisp/test-ob-sh.el diff --git a/testing/lisp/test-ob-sh.el b/testing/lisp/test-ob-sh.el deleted file mode 100644 index 87e2a95..0000000 --- a/testing/lisp/test-ob-sh.el +++ /dev/null @@ -1,52 +0,0 @@ -;;; test-ob-sh.el - -;; Copyright (c) 2010-2014 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 . - -;;; Comment: - -;; Template test file for Org-mode tests - -;;; Code: -(org-test-for-executable "sh") -(unless (featurep 'ob-shell) - (signal 'missing-test-dependency "Support for Sh code blocks")) - -(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)))) - -(ert-deftest test-ob-sh/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)))) - -(provide 'test-ob-sh) - -;;; test-ob-sh.el ends here New testing/lisp/test-ob-shell.el diff --git a/testing/lisp/test-ob-shell.el b/testing/lisp/test-ob-shell.el new file mode 100644 index 0000000..c2f2fa1 --- /dev/null +++ b/testing/lisp/test-ob-shell.el @@ -0,0 +1,52 @@ +;;; test-ob-shell.el + +;; Copyright (c) 2010-2014 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 . + +;;; Comment: + +;; Template test file for Org-mode tests + +;;; Code: +(org-test-for-executable "sh") +(unless (featurep 'ob-shell) + (signal 'missing-test-dependency "Support for Sh 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)))) + +(provide 'test-ob-shell) + +;;; test-ob-shell.el ends here Modified testing/org-test.el diff --git a/testing/org-test.el b/testing/org-test.el index c2a9fd4..879d45e 100644 --- a/testing/org-test.el +++ b/testing/org-test.el @@ -52,7 +52,7 @@ (require 'org-id) (require 'ox) (org-babel-do-load-languages - 'org-babel-load-languages '((sh . t) (org . t)))) + 'org-babel-load-languages '((shell . t) (org . t)))) (let* ((load-path (cons org-test-dir --=-=-= Content-Type: text/plain -- Bastien --=-=-=--