[PATCH 2/4 v42] test: Add `test_emacs_expect_t'.
On Mon, 23 Jan 2012 18:05:45 +, David Edmondson wrote:
> Add a new test function to allow simpler testing of emacs
> functionality.
>
> `test_emacs_expect_t' takes one argument - a lisp expression to
> evaluate. The test passes if the expression returns `t', otherwise it
> fails and the output is reported to the tester.
> ---
>
> As per Dmitry:
> - don't call `test_skip' twice,
> - allow for a prereq.
>
LGTM
Regards,
Dmitry
> test/README |8
> test/emacs-test-functions.sh |9 +
> test/notmuch-test|1 +
> test/test-lib.el |9 +
> test/test-lib.sh | 29 +
> 5 files changed, 56 insertions(+), 0 deletions(-)
> create mode 100755 test/emacs-test-functions.sh
>
> diff --git a/test/README b/test/README
> index 44ff653..43656a3 100644
> --- a/test/README
> +++ b/test/README
> @@ -202,6 +202,14 @@ library for your script to use.
> tests that may run in the same Emacs instance. Use `let' instead
> so the scope of the changed variables is limited to a single test.
>
> + test_emacs_expect_t
> +
> + This function executes the provided emacs lisp script within
> + emacs in a manner similar to 'test_emacs'. The expressions should
> + return the value `t' to indicate that the test has passed. If the
> + test does not return `t' then it is considered failed and all data
> + returned by the test is reported to the tester.
> +
> test_done
>
> Your test script must have test_done at the end. Its purpose
> diff --git a/test/emacs-test-functions.sh b/test/emacs-test-functions.sh
> new file mode 100755
> index 000..0e1f9fc
> --- /dev/null
> +++ b/test/emacs-test-functions.sh
> @@ -0,0 +1,9 @@
> +#!/usr/bin/env bash
> +
> +test_description="emacs test function sanity"
> +. test-lib.sh
> +
> +test_begin_subtest "emacs test function sanity"
> +test_emacs_expect_t 't'
> +
> +test_done
> diff --git a/test/notmuch-test b/test/notmuch-test
> index 6a99ae3..d034f99 100755
> --- a/test/notmuch-test
> +++ b/test/notmuch-test
> @@ -52,6 +52,7 @@ TESTS="
>python
>hooks
>argument-parsing
> + emacs-test-functions.sh
> "
> TESTS=${NOTMUCH_TESTS:=$TESTS}
>
> diff --git a/test/test-lib.el b/test/test-lib.el
> index 59c5868..96752f0 100644
> --- a/test/test-lib.el
> +++ b/test/test-lib.el
> @@ -83,3 +83,12 @@ nothing."
>
> (add-hook-counter 'notmuch-hello-mode-hook)
> (add-hook-counter 'notmuch-hello-refresh-hook)
> +
> +(defmacro notmuch-test-run ( body)
> + "Evaluate a BODY of test expressions and output the result."
> + `(with-temp-buffer
> + (let ((result (progn , at body)))
> + (insert (if (stringp result)
> +result
> + (prin1-to-string result)))
> + (test-output
> diff --git a/test/test-lib.sh b/test/test-lib.sh
> index 82c686c..8158328 100644
> --- a/test/test-lib.sh
> +++ b/test/test-lib.sh
> @@ -503,6 +503,35 @@ test_expect_equal_file ()
> fi
> }
>
> +test_emacs_expect_t () {
> + test "$#" = 2 && { prereq=$1; shift; } || prereq=
> + test "$#" = 1 ||
> + error "bug in the test script: not 1 or 2 parameters to
> test_emacs_expect_t"
> +
> + # Run the test.
> + if ! test_skip "$test_subtest_name"
> + then
> + test_emacs "(notmuch-test-run $1)" >/dev/null
> +
> + # Restore state after the test.
> + exec 1>&6 2>&7 # Restore stdout and stderr
> + inside_subtest=
> +
> + # Report success/failure.
> + result=$(cat OUTPUT)
> + if [ "$result" = t ]
> + then
> + test_ok_ "$test_subtest_name"
> + else
> + test_failure_ "$test_subtest_name" "${result}"
> + fi
> + else
> + # Restore state after the (non) test.
> + exec 1>&6 2>&7 # Restore stdout and stderr
> + inside_subtest=
> + fi
> +}
> +
> NOTMUCH_NEW ()
> {
> notmuch new | grep -v -E -e '^Processed [0-9]*( total)? file|Found
> [0-9]* total file'
> --
> 1.7.8.3
>
> ___
> notmuch mailing list
> notmuch at notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch
Re: [PATCH 2/4 v42] test: Add `test_emacs_expect_t'.
On Mon, 23 Jan 2012 18:05:45 +, David Edmondson d...@dme.org wrote:
Add a new test function to allow simpler testing of emacs
functionality.
`test_emacs_expect_t' takes one argument - a lisp expression to
evaluate. The test passes if the expression returns `t', otherwise it
fails and the output is reported to the tester.
---
As per Dmitry:
- don't call `test_skip' twice,
- allow for a prereq.
LGTM
Regards,
Dmitry
test/README |8
test/emacs-test-functions.sh |9 +
test/notmuch-test|1 +
test/test-lib.el |9 +
test/test-lib.sh | 29 +
5 files changed, 56 insertions(+), 0 deletions(-)
create mode 100755 test/emacs-test-functions.sh
diff --git a/test/README b/test/README
index 44ff653..43656a3 100644
--- a/test/README
+++ b/test/README
@@ -202,6 +202,14 @@ library for your script to use.
tests that may run in the same Emacs instance. Use `let' instead
so the scope of the changed variables is limited to a single test.
+ test_emacs_expect_t emacs-lisp-expressions
+
+ This function executes the provided emacs lisp script within
+ emacs in a manner similar to 'test_emacs'. The expressions should
+ return the value `t' to indicate that the test has passed. If the
+ test does not return `t' then it is considered failed and all data
+ returned by the test is reported to the tester.
+
test_done
Your test script must have test_done at the end. Its purpose
diff --git a/test/emacs-test-functions.sh b/test/emacs-test-functions.sh
new file mode 100755
index 000..0e1f9fc
--- /dev/null
+++ b/test/emacs-test-functions.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+test_description=emacs test function sanity
+. test-lib.sh
+
+test_begin_subtest emacs test function sanity
+test_emacs_expect_t 't'
+
+test_done
diff --git a/test/notmuch-test b/test/notmuch-test
index 6a99ae3..d034f99 100755
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -52,6 +52,7 @@ TESTS=
python
hooks
argument-parsing
+ emacs-test-functions.sh
TESTS=${NOTMUCH_TESTS:=$TESTS}
diff --git a/test/test-lib.el b/test/test-lib.el
index 59c5868..96752f0 100644
--- a/test/test-lib.el
+++ b/test/test-lib.el
@@ -83,3 +83,12 @@ nothing.
(add-hook-counter 'notmuch-hello-mode-hook)
(add-hook-counter 'notmuch-hello-refresh-hook)
+
+(defmacro notmuch-test-run (rest body)
+ Evaluate a BODY of test expressions and output the result.
+ `(with-temp-buffer
+ (let ((result (progn ,@body)))
+ (insert (if (stringp result)
+result
+ (prin1-to-string result)))
+ (test-output
diff --git a/test/test-lib.sh b/test/test-lib.sh
index 82c686c..8158328 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -503,6 +503,35 @@ test_expect_equal_file ()
fi
}
+test_emacs_expect_t () {
+ test $# = 2 { prereq=$1; shift; } || prereq=
+ test $# = 1 ||
+ error bug in the test script: not 1 or 2 parameters to
test_emacs_expect_t
+
+ # Run the test.
+ if ! test_skip $test_subtest_name
+ then
+ test_emacs (notmuch-test-run $1) /dev/null
+
+ # Restore state after the test.
+ exec 16 27 # Restore stdout and stderr
+ inside_subtest=
+
+ # Report success/failure.
+ result=$(cat OUTPUT)
+ if [ $result = t ]
+ then
+ test_ok_ $test_subtest_name
+ else
+ test_failure_ $test_subtest_name ${result}
+ fi
+ else
+ # Restore state after the (non) test.
+ exec 16 27 # Restore stdout and stderr
+ inside_subtest=
+ fi
+}
+
NOTMUCH_NEW ()
{
notmuch new | grep -v -E -e '^Processed [0-9]*( total)? file|Found
[0-9]* total file'
--
1.7.8.3
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch
[PATCH 2/4 v42] test: Add `test_emacs_expect_t'.
Add a new test function to allow simpler testing of emacs
functionality.
`test_emacs_expect_t' takes one argument - a lisp expression to
evaluate. The test passes if the expression returns `t', otherwise it
fails and the output is reported to the tester.
---
As per Dmitry:
- don't call `test_skip' twice,
- allow for a prereq.
test/README |8
test/emacs-test-functions.sh |9 +
test/notmuch-test|1 +
test/test-lib.el |9 +
test/test-lib.sh | 29 +
5 files changed, 56 insertions(+), 0 deletions(-)
create mode 100755 test/emacs-test-functions.sh
diff --git a/test/README b/test/README
index 44ff653..43656a3 100644
--- a/test/README
+++ b/test/README
@@ -202,6 +202,14 @@ library for your script to use.
tests that may run in the same Emacs instance. Use `let' instead
so the scope of the changed variables is limited to a single test.
+ test_emacs_expect_t
+
+ This function executes the provided emacs lisp script within
+ emacs in a manner similar to 'test_emacs'. The expressions should
+ return the value `t' to indicate that the test has passed. If the
+ test does not return `t' then it is considered failed and all data
+ returned by the test is reported to the tester.
+
test_done
Your test script must have test_done at the end. Its purpose
diff --git a/test/emacs-test-functions.sh b/test/emacs-test-functions.sh
new file mode 100755
index 000..0e1f9fc
--- /dev/null
+++ b/test/emacs-test-functions.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+test_description="emacs test function sanity"
+. test-lib.sh
+
+test_begin_subtest "emacs test function sanity"
+test_emacs_expect_t 't'
+
+test_done
diff --git a/test/notmuch-test b/test/notmuch-test
index 6a99ae3..d034f99 100755
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -52,6 +52,7 @@ TESTS="
python
hooks
argument-parsing
+ emacs-test-functions.sh
"
TESTS=${NOTMUCH_TESTS:=$TESTS}
diff --git a/test/test-lib.el b/test/test-lib.el
index 59c5868..96752f0 100644
--- a/test/test-lib.el
+++ b/test/test-lib.el
@@ -83,3 +83,12 @@ nothing."
(add-hook-counter 'notmuch-hello-mode-hook)
(add-hook-counter 'notmuch-hello-refresh-hook)
+
+(defmacro notmuch-test-run ( body)
+ "Evaluate a BODY of test expressions and output the result."
+ `(with-temp-buffer
+ (let ((result (progn , at body)))
+ (insert (if (stringp result)
+ result
+(prin1-to-string result)))
+ (test-output
diff --git a/test/test-lib.sh b/test/test-lib.sh
index 82c686c..8158328 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -503,6 +503,35 @@ test_expect_equal_file ()
fi
}
+test_emacs_expect_t () {
+ test "$#" = 2 && { prereq=$1; shift; } || prereq=
+ test "$#" = 1 ||
+ error "bug in the test script: not 1 or 2 parameters to
test_emacs_expect_t"
+
+ # Run the test.
+ if ! test_skip "$test_subtest_name"
+ then
+ test_emacs "(notmuch-test-run $1)" >/dev/null
+
+ # Restore state after the test.
+ exec 1>&6 2>&7 # Restore stdout and stderr
+ inside_subtest=
+
+ # Report success/failure.
+ result=$(cat OUTPUT)
+ if [ "$result" = t ]
+ then
+ test_ok_ "$test_subtest_name"
+ else
+ test_failure_ "$test_subtest_name" "${result}"
+ fi
+ else
+ # Restore state after the (non) test.
+ exec 1>&6 2>&7 # Restore stdout and stderr
+ inside_subtest=
+ fi
+}
+
NOTMUCH_NEW ()
{
notmuch new | grep -v -E -e '^Processed [0-9]*( total)? file|Found [0-9]*
total file'
--
1.7.8.3
