From 60845b2098a5a96709d482e26a538cc378f47675 Mon Sep 17 00:00:00 2001 From: Stephen Chang Date: Tue, 19 Jan 2016 11:56:46 -0500 Subject: [PATCH] fix broken for tests in racket-test-core --- pkgs/racket-test-core/tests/racket/for.rktl | 16 ++++++++++++---- pkgs/racket-test-core/tests/racket/testing.rktl | 8 ++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/pkgs/racket-test-core/tests/racket/for.rktl b/pkgs/racket-test-core/tests/racket/for.rktl index 98eec00217..ec943ccbe7 100644 --- a/pkgs/racket-test-core/tests/racket/for.rktl +++ b/pkgs/racket-test-core/tests/racket/for.rktl @@ -436,10 +436,18 @@ (err/rt-test (for*/fold () ([x '(1 2)]) x) exn:fail:contract:arity?) ;; for/fold result-arity checking: -(err/rt-test (begin (for/fold () ([i (in-range 10)]) 1) 1) #rx".*expected number of values not received.*") -(err/rt-test (begin (for/fold () () 1) 1) #rx".*expected number of values not received.*") -(err/rt-test (begin (for/fold ([x 1]) () (values 1 2)) 1) #rx".*expected number of values not received.*") -(err/rt-test (begin (for/fold ([x 1] [y 2]) ([i (in-range 10)]) 1) 1) #rx".*expected number of values not received.*") +(err/rt-test (begin (for/fold () ([i (in-range 10)]) 1) 1) + exn:fail:contract:arity? + #rx".*expected number of values not received.*") +(err/rt-test (begin (for/fold () () 1) 1) + exn:fail:contract:arity? + #rx".*expected number of values not received.*") +(err/rt-test (begin (for/fold ([x 1]) () (values 1 2)) 1) + exn:fail:contract:arity? + #rx".*expected number of values not received.*") +(err/rt-test (begin (for/fold ([x 1] [y 2]) ([i (in-range 10)]) 1) 1) + exn:fail:contract:arity? + #rx".*expected number of values not received.*") (test 1 'one (begin (for/fold () () (values)) 1)) ;; for/fold syntax checking diff --git a/pkgs/racket-test-core/tests/racket/testing.rktl b/pkgs/racket-test-core/tests/racket/testing.rktl index 671cbc0314..2ff4c84f06 100644 --- a/pkgs/racket-test-core/tests/racket/testing.rktl +++ b/pkgs/racket-test-core/tests/racket/testing.rktl @@ -216,6 +216,14 @@ transcript. [(_ e exn?) (syntax (thunk-error-test (err:mz:lambda () e) (quote-syntax e) exn?))] + [(_ e exn? msg-rx) + (regexp? (syntax-e #'msg-rx)) + #'(thunk-error-test + (err:mz:lambda () e) + (quote-syntax e) + (lambda (exn) + (and (exn? exn) + (regexp-match? msg-rx (exn-message exn)))))] [(_ e) (syntax (err/rt-test e exn:application:type?))])))