Flatten nested setup_call_cleanup calls in tests

When multiple process_create calls are needed in a test, each stream must have its own setup_call_cleanup wrapper. Previously used a single setup_call_cleanup with compound setup and cleanup goals, which is incorrect. Changed from: setup_call_cleanup( (create1, create2), test_body, (close2, close1) ) To proper nesting: setup_call_cleanup( create1, setup_call_cleanup( create2, test_body, close2 ), close1 ) This ensures proper cleanup order even if tests fail.

Author: jjtolton

src/tests/get_n_chars.pl

@@ -11,15 +11,17 @@
  atom_chars('/bin/echo', Echo),
  atom_chars('ABCDEFGHIJ', Content),
  iso_ext:setup_call_cleanup(
- ( process:process_create(Echo, [Content], [stdout(pipe(Out1))]),
- process:process_create(Echo, [Content], [stdout(pipe(Out2))]) ),
- (
- charsio:get_n_chars(Out1, 5, Chars1),
- charsio:get_n_chars(Out2, 5, Chars2, 0),
- Chars1 = Chars2
+ process:process_create(Echo, [Content], [stdout(pipe(Out1))]),
+ iso_ext:setup_call_cleanup(
+ process:process_create(Echo, [Content], [stdout(pipe(Out2))]),
+ (
+ charsio:get_n_chars(Out1, 5, Chars1),
+ charsio:get_n_chars(Out2, 5, Chars2, 0),
+ Chars1 = Chars2
+ ),
+ close(Out2)
  ),
- ( close(Out2),
- close(Out1) )
+ close(Out1)
  )
 )).
 
@@ -28,18 +30,20 @@
  atom_chars('/bin/echo', Echo),
  atom_chars('Testing', Content),
  iso_ext:setup_call_cleanup(
- ( process:process_create(Echo, [Content], [stdout(pipe(Out1))]),
- process:process_create(Echo, [Content], [stdout(pipe(Out2))]) ),
- (
- charsio:get_n_chars(Out1, N1, Chars1),
- charsio:get_n_chars(Out2, N2, Chars2, 0),
- N1 = N2,
- Chars1 = Chars2,
- N1 = 8,
- Chars1 = "Testing\n"
+ process:process_create(Echo, [Content], [stdout(pipe(Out1))]),
+ iso_ext:setup_call_cleanup(
+ process:process_create(Echo, [Content], [stdout(pipe(Out2))]),
+ (
+ charsio:get_n_chars(Out1, N1, Chars1),
+ charsio:get_n_chars(Out2, N2, Chars2, 0),
+ N1 = N2,
+ Chars1 = Chars2,
+ N1 = 8,
+ Chars1 = "Testing\n"
+ ),
+ close(Out2)
  ),
- ( close(Out2),
- close(Out1) )
+ close(Out1)
  )
 )).
 
@@ -48,16 +52,18 @@
  atom_chars('/bin/echo', Echo),
  atom_chars('NegativeTest', Content),
  iso_ext:setup_call_cleanup(
- ( process:process_create(Echo, [Content], [stdout(pipe(Out1))]),
- process:process_create(Echo, [Content], [stdout(pipe(Out2))]) ),
- (
- charsio:get_n_chars(Out1, N1, Chars1),
- charsio:get_n_chars(Out2, N2, Chars2, -100),
- N1 = N2,
- Chars1 = Chars2
+ process:process_create(Echo, [Content], [stdout(pipe(Out1))]),
+ iso_ext:setup_call_cleanup(
+ process:process_create(Echo, [Content], [stdout(pipe(Out2))]),
+ (
+ charsio:get_n_chars(Out1, N1, Chars1),
+ charsio:get_n_chars(Out2, N2, Chars2, -100),
+ N1 = N2,
+ Chars1 = Chars2
+ ),
+ close(Out2)
  ),
- ( close(Out2),
- close(Out1) )
+ close(Out1)
  )
 )).