OSDN -- Develop and Download Open Source Software
  • R/O
  • SSH
Fork

kink: Commit

Kink runtime


Commit MetaInfo

Revision59104b25d065177653b7333de682127cb6275ed9 (tree)
Time2023-03-17 22:14:20
Authormiyakawataku
Commitermiyakawataku

Log Message

replace CONTROL.try in tests of PROCESS mod

Change Summary

Incremental Difference

diff -r b0a1b6e5e0c4 -r 59104b25d065 src/test/kink/PROCESS_test.kn
--- a/src/test/kink/PROCESS_test.kn Thu Mar 16 22:04:06 2023 +0900
+++ b/src/test/kink/PROCESS_test.kn Fri Mar 17 22:14:20 2023 +0900
@@ -82,21 +82,22 @@
8282
8383 TEST.test('raise exception when absent'){
8484 :Env_map = FLAT_MAP.of('HOME' '/home/foo')
85- CONTROL.try(
85+ CONTROL.xtry(
8686 { PROCESS._aux_env('PATH' Env_map) }
8787 {(:R) raise('got {}'.format(R.repr)) }
88- {(:Msg :Traces)
89- Msg.have_slice?('PROCESS.env') || reraise(Msg Traces)
88+ {(:Exc)
89+ Exc.message.have_slice?('PROCESS.env') || Exc.raise
9090 }
9191 )
9292 }
9393
9494 TEST.test('requires str'){
95- CONTROL.try(
95+ CONTROL.xtry(
9696 { PROCESS.env(nada) }
9797 {(:R) raise('got {}'.format(R.repr)) }
98- {(:Msg :Traces)
99- Msg.have_slice?('nada') && Msg.have_slice?('.env') || reraise(Msg Traces)
98+ {(:Exc)
99+ :Msg = Exc.message
100+ Msg.have_slice?('nada') && Msg.have_slice?('.env') || Exc.raise
100101 }
101102 )
102103 }
@@ -115,11 +116,12 @@
115116 }
116117
117118 TEST.test('requires str'){
118- CONTROL.try(
119+ CONTROL.xtry(
119120 { PROCESS.have_env?(nada) }
120121 {(:R) raise('got {}'.format(R.repr)) }
121- {(:Msg :Traces)
122- Msg.have_slice?('nada') && Msg.have_slice?('.have_env?') || reraise(Msg Traces)
122+ {(:Exc)
123+ :Msg = Exc.message
124+ Msg.have_slice?('nada') && Msg.have_slice?('.have_env?') || Exc.raise
123125 }
124126 )
125127 }
@@ -159,41 +161,45 @@
159161 }
160162
161163 TEST.test('cannot convert too small status'){
162- CONTROL.try(
164+ CONTROL.xtry(
163165 { PROCESS._check_exit_status(-2147483649) }
164166 {(:R) raise('got {}'.format(R.repr)) }
165- {(:Msg :Traces)
166- Msg.have_slice?('PROCESS.exit') && Msg.have_slice?('-2147483649') || reraise(Msg Traces)
167+ {(:Exc)
168+ :Msg = Exc.message
169+ Msg.have_slice?('PROCESS.exit') && Msg.have_slice?('-2147483649') || Exc.raise
167170 }
168171 )
169172 }
170173
171174 TEST.test('cannot convert too big status'){
172- CONTROL.try(
175+ CONTROL.xtry(
173176 { PROCESS._check_exit_status(2147483648) }
174177 {(:R) raise('got {}'.format(R.repr)) }
175- {(:Msg :Traces)
176- Msg.have_slice?('PROCESS.exit') && Msg.have_slice?('2147483648') || reraise(Msg Traces)
178+ {(:Exc)
179+ :Msg = Exc.message
180+ Msg.have_slice?('PROCESS.exit') && Msg.have_slice?('2147483648') || Exc.raise
177181 }
178182 )
179183 }
180184
181185 TEST.test('cannot convert nada'){
182- CONTROL.try(
186+ CONTROL.xtry(
183187 { PROCESS._check_exit_status(nada) }
184188 {(:R) raise('got {}'.format(R.repr)) }
185- {(:Msg :Traces)
186- Msg.have_slice?('PROCESS.exit') && Msg.have_slice?('nada') || reraise(Msg Traces)
189+ {(:Exc)
190+ :Msg = Exc.message
191+ Msg.have_slice?('PROCESS.exit') && Msg.have_slice?('nada') || Exc.raise
187192 }
188193 )
189194 }
190195
191196 TEST.test('cannot convert non-int num'){
192- CONTROL.try(
197+ CONTROL.xtry(
193198 { PROCESS._check_exit_status(3.14) }
194199 {(:R) raise('got {}'.format(R.repr)) }
195- {(:Msg :Traces)
196- Msg.have_slice?('PROCESS.exit') && Msg.have_slice?('3.14') || reraise(Msg Traces)
200+ {(:Exc)
201+ :Msg = Exc.message
202+ Msg.have_slice?('PROCESS.exit') && Msg.have_slice?('3.14') || Exc.raise
197203 }
198204 )
199205 }
@@ -213,31 +219,34 @@
213219
214220 TEST.group('Command_and_args'){ # {{{
215221 TEST.test('must be a vec'){
216- CONTROL.try(
222+ CONTROL.xtry(
217223 { PROCESS.start(nada) }
218224 {(:R) raise('got {}'.format(R.repr)) }
219- {(:Msg :Traces)
220- Msg.have_slice?('PROCESS.start') && Msg.have_slice?('nada') || reraise(Msg Traces)
225+ {(:Exc)
226+ :Msg = Exc.message
227+ Msg.have_slice?('PROCESS.start') && Msg.have_slice?('nada') || Exc.raise
221228 }
222229 )
223230 }
224231
225232 TEST.test('must have at least one elem'){
226- CONTROL.try(
233+ CONTROL.xtry(
227234 { PROCESS.start([]) }
228235 {(:R) raise('got {}'.format(R.repr)) }
229- {(:Msg :Traces)
230- Msg.have_slice?('PROCESS.start') && Msg.have_slice?('[]') || reraise(Msg Traces)
236+ {(:Exc)
237+ :Msg = Exc.message
238+ Msg.have_slice?('PROCESS.start') && Msg.have_slice?('[]') || Exc.raise
231239 }
232240 )
233241 }
234242
235243 TEST.test('all the elems must be strs'){
236- CONTROL.try(
244+ CONTROL.xtry(
237245 { PROCESS.start(['ls' 42]) }
238246 {(:R) raise('got {}'.format(R.repr)) }
239- {(:Msg :Traces)
240- Msg.have_slice?('PROCESS.start') && Msg.have_slice?('42') || reraise(Msg Traces)
247+ {(:Exc)
248+ :Msg = Exc.message
249+ Msg.have_slice?('PROCESS.start') && Msg.have_slice?('42') || Exc.raise
241250 }
242251 )
243252 }
@@ -299,16 +308,17 @@
299308 || raise('got {}'.format(In.repr))
300309 }
301310
302- TEST.test('File_path msut be a str'){
303- CONTROL.try(
311+ TEST.test('File_path must be a str'){
312+ CONTROL.xtry(
304313 { PROCESS._read_start_conf(['ls' '-l']){(:C)
305314 C.stdin_from_file(nada)
306315 }
307316 }
308317 {(:R) raise('got {}'.format(R.repr)) }
309- {(:Msg :Traces)
318+ {(:Exc)
319+ :Msg = Exc.message
310320 Msg.have_slice?('nada') && Msg.have_slice?('.stdin_from_file')
311- || reraise(Msg Traces)
321+ || Exc.raise
312322 }
313323 )
314324 }
@@ -359,11 +369,12 @@
359369 }
360370
361371 TEST.test('File_path must be a str'){
362- CONTROL.try(
372+ CONTROL.xtry(
363373 { PROCESS._read_start_conf(['ls' '-l']){(:C) C.stdout_to_overwrite(nada) } }
364374 {(:R) raise('got {}'.format(R.repr)) }
365- {(:Msg :Traces)
366- Msg.have_slice?('nada') && Msg.have_slice?('.stdout_to_overwrite') || reraise(Msg Traces)
375+ {(:Exc)
376+ :Msg = Exc.message
377+ Msg.have_slice?('nada') && Msg.have_slice?('.stdout_to_overwrite') || Exc.raise
367378 }
368379 )
369380 }
@@ -387,14 +398,15 @@
387398 }
388399
389400 TEST.test('File_path must be a str'){
390- CONTROL.try(
401+ CONTROL.xtry(
391402 { PROCESS._read_start_conf(['ls' '-l']){(:C)
392403 C.stdout_to_append(nada)
393404 }
394405 }
395406 {(:R) raise('got {}'.format(R.repr)) }
396- {(:Msg :Traces)
397- Msg.have_slice?('nada') && Msg.have_slice?('.stdout_to_append') || reraise(Msg Traces)
407+ {(:Exc)
408+ :Msg = Exc.message
409+ Msg.have_slice?('nada') && Msg.have_slice?('.stdout_to_append') || Exc.raise
398410 }
399411 )
400412 }
@@ -444,14 +456,15 @@
444456 }
445457
446458 TEST.test('File_path must be a str'){
447- CONTROL.try(
459+ CONTROL.xtry(
448460 { PROCESS._read_start_conf(['ls' '-l']){(:C)
449461 C.stderr_to_overwrite(nada)
450462 }
451463 }
452464 {(:R) raise('got {}'.format(R.repr)) }
453- {(:Msg :Traces)
454- Msg.have_slice?('.stderr_to_overwrite') && Msg.have_slice?('nada') || reraise(Msg Traces)
465+ {(:Exc)
466+ :Msg = Exc.message
467+ Msg.have_slice?('.stderr_to_overwrite') && Msg.have_slice?('nada') || Exc.raise
455468 }
456469 )
457470 }
@@ -474,11 +487,12 @@
474487 }
475488
476489 TEST.test('File_path must be a str'){
477- CONTROL.try(
490+ CONTROL.xtry(
478491 { PROCESS._read_start_conf(['ls' '-l']){(:C) C.stderr_to_append(nada) } }
479492 {(:R) raise('got {}'.format(R.repr)) }
480- {(:Msg :Traces)
481- Msg.have_slice?('nada') && Msg.have_slice?('stderr_to_append') || reraise(Msg Traces)
493+ {(:Exc)
494+ :Msg = Exc.message
495+ Msg.have_slice?('nada') && Msg.have_slice?('stderr_to_append') || Exc.raise
482496 }
483497 )
484498 }
@@ -522,11 +536,12 @@
522536 }
523537
524538 TEST.test('Dir_path must be a str'){
525- CONTROL.try(
539+ CONTROL.xtry(
526540 { PROCESS.start(['ls']){(:C) C.dir(nada) } }
527541 {(:R) raise('got {}'.format(R.repr)) }
528- {(:Msg :Traces)
529- Msg.have_slice?('nada') && Msg.have_slice?('.dir') || reraise(Msg Traces)
542+ {(:Exc)
543+ :Msg = Exc.message
544+ Msg.have_slice?('nada') && Msg.have_slice?('.dir') || Exc.raise
530545 }
531546 )
532547 }
@@ -545,27 +560,29 @@
545560 }
546561
547562 TEST.test('Env_name must be a str'){
548- CONTROL.try(
563+ CONTROL.xtry(
549564 { PROCESS._read_start_conf(['ls' '-l']){(:C)
550565 C.set_env(nada 'hello world')
551566 }
552567 }
553568 {(:R) raise('got {}'.format(R.repr)) }
554- {(:Msg :Traces)
555- Msg.have_slice?('nada') && Msg.have_slice?('set_env') || reraise(Msg Traces)
569+ {(:Exc)
570+ :Msg = Exc.message
571+ Msg.have_slice?('nada') && Msg.have_slice?('set_env') || Exc.raise
556572 }
557573 )
558574 }
559575
560576 TEST.test('Env_val must be a str'){
561- CONTROL.try(
577+ CONTROL.xtry(
562578 { PROCESS._read_start_conf(['ls' '-l']){(:C)
563579 C.set_env('env_name' nada)
564580 }
565581 }
566582 {(:R) raise('got {}'.format(R.repr)) }
567- {(:Msg :Traces)
568- Msg.have_slice?('nada') && Msg.have_slice?('set_env') || reraise(Msg Traces)
583+ {(:Exc)
584+ :Msg = Exc.message
585+ Msg.have_slice?('nada') && Msg.have_slice?('set_env') || Exc.raise
569586 }
570587 )
571588 }
@@ -585,14 +602,15 @@
585602 }
586603
587604 TEST.test('Env_name must be a str'){
588- CONTROL.try(
605+ CONTROL.xtry(
589606 { PROCESS._read_start_conf(['ls' '-l']){(:C)
590607 C.unset_env(nada)
591608 }
592609 }
593610 {(:R) raise('got {}'.format(R.repr)) }
594- {(:Msg :Traces)
595- Msg.have_slice?('nada') && Msg.have_slice?('unset_env') || reraise(Msg Traces)
611+ {(:Exc)
612+ :Msg = Exc.message
613+ Msg.have_slice?('nada') && Msg.have_slice?('unset_env') || Exc.raise
596614 }
597615 )
598616 }
@@ -646,14 +664,15 @@
646664 }
647665
648666 TEST.test('success cont must be a fun'){
649- CONTROL.try(
667+ CONTROL.xtry(
650668 { PROCESS._read_start_conf(['ls' '-l']){(:C)
651669 C.on_success(nada)
652670 }
653671 }
654672 {(:R) raise('got {}'.format(R.repr)) }
655- {(:Msg :Traces)
656- Msg.have_slice?('nada') && Msg.have_slice?('on_success') || reraise(Msg Traces)
673+ {(:Exc)
674+ :Msg = Exc.message
675+ Msg.have_slice?('nada') && Msg.have_slice?('on_success') || Exc.raise
657676 }
658677 )
659678 }
@@ -671,14 +690,15 @@
671690 }
672691
673692 TEST.test('error cont must be a fun'){
674- CONTROL.try(
693+ CONTROL.xtry(
675694 { PROCESS._read_start_conf(['ls' '-l']){(:C)
676695 C.on_error(nada)
677696 }
678697 }
679698 {(:R) raise('got {}'.format(R.repr)) }
680- {(:Msg :Traces)
681- Msg.have_slice?('nada') && Msg.have_slice?('on_error') || reraise(Msg Traces)
699+ {(:Exc)
700+ :Msg = Exc.message
701+ Msg.have_slice?('nada') && Msg.have_slice?('on_error') || Exc.raise
682702 }
683703 )
684704 }
@@ -735,11 +755,11 @@
735755 CONTROL.with_on_exit{(:on_exit)
736756 :Subp = PROCESS.start([_exe_file 'script: {}'.format(Script)])
737757 on_exit{ Subp.wait }
738- CONTROL.try(
758+ CONTROL.xtry(
739759 { Subp.stdin }
740760 {(:R) raise('got {}'.format(R.repr)) }
741- {(:Msg :Traces)
742- Msg.have_slice?('.stdin') || reraise(Msg Traces)
761+ {(:Exc)
762+ Exc.message.have_slice?('.stdin') || Exc.raise
743763 }
744764 )
745765 }
@@ -763,11 +783,11 @@
763783 CONTROL.with_on_exit{(:on_exit)
764784 :Subp = PROCESS.start([_exe_file 'script: {}'.format(Script)])
765785 on_exit{ Subp.wait }
766- CONTROL.try(
786+ CONTROL.xtry(
767787 { Subp.stdout }
768788 {(:R) raise('got {}'.format(R.repr)) }
769- {(:Msg :Traces)
770- Msg.have_slice?('.stdout') || reraise(Msg Traces)
789+ {(:Exc)
790+ Exc.message.have_slice?('.stdout') || Exc.raise
771791 }
772792 )
773793 }
@@ -792,11 +812,11 @@
792812 CONTROL.with_on_exit{(:on_exit)
793813 :Subp = PROCESS.start([_exe_file 'script: {}'.format(Script)])
794814 on_exit{ Subp.wait }
795- CONTROL.try(
815+ CONTROL.xtry(
796816 { Subp.stderr }
797817 {(:R) raise('got {}'.format(R.repr)) }
798- {(:Msg :Traces)
799- Msg.have_slice?('.stderr') || reraise(Msg Traces)
818+ {(:Exc)
819+ Exc.message.have_slice?('.stderr') || Exc.raise
800820 }
801821 )
802822 }
@@ -810,11 +830,11 @@
810830 C.stderr_to_stdout
811831 }
812832 on_exit{ Subp.wait }
813- CONTROL.try(
833+ CONTROL.xtry(
814834 { Subp.stderr }
815835 {(:R) raise('got {}'.format(R.repr)) }
816- {(:Msg :Traces)
817- Msg.have_slice?('.stderr') || reraise(Msg Traces)
836+ {(:Exc)
837+ Exc.message.have_slice?('.stderr') || Exc.raise
818838 }
819839 )
820840 }
@@ -851,11 +871,11 @@
851871 TEST.test('timeout'){
852872 :Script = ":THREAD.require_from('kink/thread/') THREAD.sleep(5)"
853873 :Subp = PROCESS.start([_exe_file 'script: {}'.format(Script)])
854- CONTROL.try(
874+ CONTROL.xtry(
855875 { Subp.wait{(:C) C.timeout(0.5) } }
856876 {(:R) raise('got {}'.format(R.repr)) }
857- {(:Msg :Traces)
858- Msg.have_slice?('.wait') || reraise(Msg Traces)
877+ {(:Exc)
878+ Exc.message.have_slice?('.wait') || Exc.raise
859879 }
860880 )
861881 }
@@ -903,7 +923,7 @@
903923 THREAD.spawn{
904924 Wait_thread.call_method('interrupt' [])
905925 }
906- CONTROL.try(
926+ CONTROL.xtry(
907927 { Subp.wait{(:C)
908928 C.on_terminate{(:Exit_status)
909929 'exit status: {}'.format(Exit_status.repr)
@@ -911,7 +931,7 @@
911931 }
912932 }
913933 {(:R) raise('got {}'.format(R.repr)) }
914- {(:Msg :Traces)
934+ {(:Exc)
915935 'ok; interrupted'
916936 }
917937 )
@@ -929,7 +949,7 @@
929949 THREAD.spawn{
930950 Wait_thread.call_method('interrupt' [])
931951 }
932- CONTROL.try(
952+ CONTROL.xtry(
933953 { Subp.wait{(:C)
934954 C.timeout(1000)
935955 C.on_terminate{(:Exit_status)
@@ -938,7 +958,7 @@
938958 }
939959 }
940960 {(:R) raise('got {}'.format(R.repr)) }
941- {(:Msg :Traces)
961+ {(:Exc)
942962 'ok; interrupted'
943963 }
944964 )
@@ -962,21 +982,23 @@
962982 TEST.group('.timeout'){ # {{{
963983
964984 TEST.test('Seconds must be a num'){
965- CONTROL.try(
985+ CONTROL.xtry(
966986 { PROCESS._read_wait_conf{(:C) C.timeout(nada) } }
967987 {(:R) raise('got {}'.format(R.repr)) }
968- {(:Msg :Traces)
969- Msg.have_slice?('.timeout') && Msg.have_slice?('nada') || reraise(Msg Traces)
988+ {(:Exc)
989+ :Msg = Exc.message
990+ Msg.have_slice?('.timeout') && Msg.have_slice?('nada') || Exc.raise
970991 }
971992 )
972993 }
973994
974995 TEST.test('reject negative timeout'){
975- CONTROL.try(
996+ CONTROL.xtry(
976997 { PROCESS._read_wait_conf{(:C) C.timeout(-0.001) } }
977998 {(:R) raise('got {}'.format(R.repr)) }
978- {(:Msg :Traces)
979- Msg.have_slice?('.timeout') && Msg.have_slice?('-0.001') || reraise(Msg Traces)
999+ {(:Exc)
1000+ :Msg = Exc.message
1001+ Msg.have_slice?('.timeout') && Msg.have_slice?('-0.001') || Exc.raise
9801002 }
9811003 )
9821004 }
@@ -1009,22 +1031,24 @@
10091031
10101032 # }}}
10111033 TEST.test('.on_terminate requires fun'){ # {{{
1012- CONTROL.try(
1034+ CONTROL.xtry(
10131035 { PROCESS._read_wait_conf{(:C) C.on_terminate(nada) } }
10141036 {(:R) raise('got {}'.format(R.repr)) }
1015- {(:Msg :Traces)
1016- Msg.have_slice?('.on_terminate') && Msg.have_slice?('nada') || reraise(Msg Traces)
1037+ {(:Exc)
1038+ :Msg = Exc.message
1039+ Msg.have_slice?('.on_terminate') && Msg.have_slice?('nada') || Exc.raise
10171040 }
10181041 )
10191042 }
10201043
10211044 # }}}
10221045 TEST.test('.on_timeout'){ # {{{
1023- CONTROL.try(
1046+ CONTROL.xtry(
10241047 { PROCESS._read_wait_conf{(:C) C.on_timeout(nada) } }
10251048 {(:R) raise('got {}'.format(R.repr)) }
1026- {(:Msg :Traces)
1027- Msg.have_slice?('.on_timeout') && Msg.have_slice?('nada') || reraise(Msg Traces)
1049+ {(:Exc)
1050+ :Msg = Exc.message
1051+ Msg.have_slice?('.on_timeout') && Msg.have_slice?('nada') || Exc.raise
10281052 }
10291053 )
10301054 }
Show on old repository browser