From 0962b4a697b7dec7886fa4e5ac786d5f0b76c5e9 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Tue, 19 May 2015 10:50:17 -0700 Subject: [PATCH] io.monitors: Run each set of monitors tests in its own directory. Fixes #1106. --- basis/io/monitors/monitors-tests.factor | 164 ++++++++++++------------ 1 file changed, 80 insertions(+), 84 deletions(-) diff --git a/basis/io/monitors/monitors-tests.factor b/basis/io/monitors/monitors-tests.factor index 666de2e1b6..57e34e110a 100644 --- a/basis/io/monitors/monitors-tests.factor +++ b/basis/io/monitors/monitors-tests.factor @@ -7,126 +7,122 @@ IN: io.monitors.tests os { windows linux macosx } member? [ [ - [ "monitor-test" temp-file delete-tree ] ignore-errors + [ + [ "monitor-test" temp-file delete-tree ] ignore-errors - [ ] [ "monitor-test" temp-file make-directory ] unit-test + [ ] [ "monitor-test" temp-file make-directory ] unit-test - [ ] [ "monitor-test" temp-file t "m" set ] unit-test + [ ] [ "monitor-test" temp-file t "m" set ] unit-test - [ ] [ "monitor-test/a1" temp-file make-directory ] unit-test + [ ] [ "monitor-test/a1" temp-file make-directory ] unit-test - [ ] [ "monitor-test/a2" temp-file make-directory ] unit-test + [ ] [ "monitor-test/a2" temp-file make-directory ] unit-test - [ ] [ "monitor-test/a1" temp-file "monitor-test/a2" temp-file move-file-into ] unit-test + [ ] [ "monitor-test/a1" temp-file "monitor-test/a2" temp-file move-file-into ] unit-test - [ t ] [ "monitor-test/a2/a1" temp-file exists? ] unit-test + [ t ] [ "monitor-test/a2/a1" temp-file exists? ] unit-test - [ ] [ "monitor-test/a2/a1/a3.txt" temp-file touch-file ] unit-test + [ ] [ "monitor-test/a2/a1/a3.txt" temp-file touch-file ] unit-test - [ t ] [ "monitor-test/a2/a1/a3.txt" temp-file exists? ] unit-test + [ t ] [ "monitor-test/a2/a1/a3.txt" temp-file exists? ] unit-test - [ ] [ "monitor-test/a2/a1/a4.txt" temp-file touch-file ] unit-test - [ ] [ "monitor-test/a2/a1/a5.txt" temp-file touch-file ] unit-test - [ ] [ "monitor-test/a2/a1/a4.txt" temp-file delete-file ] unit-test - [ ] [ "monitor-test/a2/a1/a5.txt" temp-file "monitor-test/a2/a1/a4.txt" temp-file move-file ] unit-test + [ ] [ "monitor-test/a2/a1/a4.txt" temp-file touch-file ] unit-test + [ ] [ "monitor-test/a2/a1/a5.txt" temp-file touch-file ] unit-test + [ ] [ "monitor-test/a2/a1/a4.txt" temp-file delete-file ] unit-test + [ ] [ "monitor-test/a2/a1/a5.txt" temp-file "monitor-test/a2/a1/a4.txt" temp-file move-file ] unit-test - [ t ] [ "monitor-test/a2/a1/a4.txt" temp-file exists? ] unit-test + [ t ] [ "monitor-test/a2/a1/a4.txt" temp-file exists? ] unit-test - [ ] [ "m" get dispose ] unit-test + [ ] [ "m" get dispose ] unit-test + ] with-unique-directory delete-tree ] with-monitors [ - [ "monitor-test" temp-file delete-tree ] ignore-errors - - [ ] [ "monitor-test/xyz" temp-file make-directories ] unit-test - - [ ] [ "monitor-test" temp-file t "m" set ] unit-test - - [ ] [ 1 "b" set ] unit-test - - [ ] [ 1 "c1" set ] unit-test - - [ ] [ 1 "c2" set ] unit-test - - [ ] [ - [ - "b" get count-down + [ + [ "monitor-test" temp-file delete-tree ] ignore-errors + [ ] [ "monitor-test/xyz" temp-file make-directories ] unit-test + [ ] [ "monitor-test" temp-file t "m" set ] unit-test + [ ] [ 1 "b" set ] unit-test + [ ] [ 1 "c1" set ] unit-test + [ ] [ 1 "c2" set ] unit-test + [ ] [ [ - "m" get next-change path>> - dup print flush - dup parent-directory - [ trim-tail-separators "xyz" tail? ] either? not - ] loop + "b" get count-down - "c1" get count-down - - [ - "m" get next-change path>> - dup print flush - dup parent-directory - [ trim-tail-separators "yxy" tail? ] either? not - ] loop + [ + "m" get next-change path>> + dup print flush + dup parent-directory + [ trim-tail-separators "xyz" tail? ] either? not + ] loop - "c2" get count-down - ] "Monitor test thread" spawn drop - ] unit-test - - [ ] [ "b" get await ] unit-test - - [ ] [ "monitor-test/xyz/test.txt" temp-file touch-file ] unit-test + "c1" get count-down + [ + "m" get next-change path>> + dup print flush + dup parent-directory + [ trim-tail-separators "yxy" tail? ] either? not + ] loop - [ ] [ "c1" get 1 minutes await-timeout ] unit-test - - [ ] [ "monitor-test/subdir/blah/yxy" temp-file make-directories ] unit-test + "c2" get count-down + ] "Monitor test thread" spawn drop + ] unit-test - [ ] [ "monitor-test/subdir/blah/yxy/test.txt" temp-file touch-file ] unit-test + [ ] [ "b" get await ] unit-test + [ ] [ "monitor-test/xyz/test.txt" temp-file touch-file ] unit-test + [ ] [ "c1" get 1 minutes await-timeout ] unit-test + [ ] [ "monitor-test/subdir/blah/yxy" temp-file make-directories ] unit-test + [ ] [ "monitor-test/subdir/blah/yxy/test.txt" temp-file touch-file ] unit-test + [ ] [ "c2" get 1 minutes await-timeout ] unit-test - [ ] [ "c2" get 1 minutes await-timeout ] unit-test - - ! Dispose twice - [ ] [ "m" get dispose ] unit-test - - [ ] [ "m" get dispose ] unit-test + ! Dispose twice + [ ] [ "m" get dispose ] unit-test + [ ] [ "m" get dispose ] unit-test + ] with-unique-directory delete-tree ] with-monitors ! Out-of-scope disposal should not fail [ ] [ [ "" resource-path f ] with-monitors dispose ] unit-test [ ] [ [ "" resource-path t ] with-monitors dispose ] unit-test - + ! Timeouts [ - [ ] [ "monitor-timeout-test" temp-file make-directories ] unit-test + [ + [ ] [ "monitor-timeout-test" temp-file make-directories ] unit-test - ! Non-recursive - [ ] [ "monitor-timeout-test" temp-file f "m" set ] unit-test - [ ] [ 3 seconds "m" get set-timeout ] unit-test - [ [ t ] [ "m" get next-change drop ] while ] must-fail - [ ] [ "m" get dispose ] unit-test + ! Non-recursive + [ ] [ "monitor-timeout-test" temp-file f "m" set ] unit-test + [ ] [ 3 seconds "m" get set-timeout ] unit-test + [ [ t ] [ "m" get next-change drop ] while ] must-fail + [ ] [ "m" get dispose ] unit-test - ! Recursive - [ ] [ "monitor-timeout-test" temp-file t "m" set ] unit-test - [ ] [ 3 seconds "m" get set-timeout ] unit-test - [ [ t ] [ "m" get next-change drop ] while ] must-fail - [ ] [ "m" get dispose ] unit-test + ! Recursive + [ ] [ "monitor-timeout-test" temp-file t "m" set ] unit-test + [ ] [ 3 seconds "m" get set-timeout ] unit-test + [ [ t ] [ "m" get next-change drop ] while ] must-fail + [ ] [ "m" get dispose ] unit-test + ] with-unique-directory delete-tree ] with-monitors ! Disposing a monitor should throw an error in any threads ! waiting on notifications [ - [ ] [ - "p" set - "monitor-test" temp-file t "m" set - 10 seconds "m" get set-timeout - ] unit-test - [ - [ "m" get next-change ] [ ] recover - "p" get fulfill - ] in-thread + [ ] [ + "p" set + "monitor-test" temp-file t "m" set + 10 seconds "m" get set-timeout + ] unit-test - [ ] [ 1 seconds sleep ] unit-test - [ ] [ "m" get dispose ] unit-test - [ t ] [ "p" get 10 seconds ?promise-timeout already-disposed? ] unit-test + [ + [ "m" get next-change ] [ ] recover + "p" get fulfill + ] in-thread + + [ ] [ 1 seconds sleep ] unit-test + [ ] [ "m" get dispose ] unit-test + [ t ] [ "p" get 10 seconds ?promise-timeout already-disposed? ] unit-test + ] with-unique-directory delete-tree ] with-monitors ] when