tests: (lsfd::mkfds-unix-dgram, refactor) split the test into subtests

Signed-off-by: Masatake YAMATO <yamato@redhat.com>

diff --git a/tests/expected/lsfd/mkfds-unix-dgram b/tests/expected/lsfd/mkfds-unix-dgram
index dfd91e6724d521f3e07c587b0fbe56f2e02f9fc6..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/tests/expected/lsfd/mkfds-unix-dgram
+++ b/tests/expected/lsfd/mkfds-unix-dgram
@@ -1,6 +0,0 @@
-3 SOCK state=connected\x20path=test_mkfds-unix-dgram\x20type=dgram connected dgram 0 test_mkfds-unix-dgram
-4 SOCK state=connected\x20type=dgram connected dgram 0 
-ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0
-3 SOCK state=connected\x20path=@test_mkfds-unix-dgram\x20type=dgram connected dgram 0 @test_mkfds-unix-dgram
-4 SOCK state=connected\x20type=dgram connected dgram 0 
-ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0

diff --git a/tests/expected/lsfd/mkfds-unix-dgram-abstract b/tests/expected/lsfd/mkfds-unix-dgram-abstract
new file mode 100644 (file)
index 0000000..cc5aa84
--- /dev/null
+++ b/tests/expected/lsfd/mkfds-unix-dgram-abstract
@@ -0,0 +1,3 @@
+3 SOCK state=connected\x20path=@test_mkfds-unix-dgram\x20type=dgram connected dgram 0 @test_mkfds-unix-dgram
+4 SOCK state=connected\x20type=dgram connected dgram 0 
+ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0

diff --git a/tests/expected/lsfd/mkfds-unix-dgram-non-abstract b/tests/expected/lsfd/mkfds-unix-dgram-non-abstract
new file mode 100644 (file)
index 0000000..2a9f094
--- /dev/null
+++ b/tests/expected/lsfd/mkfds-unix-dgram-non-abstract
@@ -0,0 +1,3 @@
+3 SOCK state=connected\x20path=test_mkfds-unix-dgram\x20type=dgram connected dgram 0 test_mkfds-unix-dgram
+4 SOCK state=connected\x20type=dgram connected dgram 0 
+ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0

diff --git a/tests/ts/lsfd/mkfds-unix-dgram b/tests/ts/lsfd/mkfds-unix-dgram
index 45a0b2da0d887ed87bdaa0e6174d637abae67f40..c3b0711e4a590d090bf3f6777819af413db0df0b 100755 (executable)
--- a/tests/ts/lsfd/mkfds-unix-dgram
+++ b/tests/ts/lsfd/mkfds-unix-dgram
@@ -38,6 +38,7 @@ make_state_connected()
     lsfd_make_state_connected | sed -e 's/unconnected/connected/'
 }
 
+ts_init_subtest "non-abstract"
 {
     coproc MKFDS { "$TS_HELPER_MKFDS" unix-dgram $FDS $FDC \
                                      path=test_mkfds-unix-dgram ; }
@@ -51,7 +52,11 @@ make_state_connected()
        echo DONE >&"${MKFDS[1]}"
     fi
     wait "${MKFDS_PID}"
+} > "$TS_OUTPUT" 2>&1
+ts_finalize_subtest
 
+ts_init_subtest "abstract"
+{
     coproc MKFDS { "$TS_HELPER_MKFDS" unix-dgram $FDS $FDC \
                                      path=test_mkfds-unix-dgram \
                                      abstract=true ; }
@@ -66,5 +71,6 @@ make_state_connected()
     fi
     wait "${MKFDS_PID}"
 } > "$TS_OUTPUT" 2>&1
+ts_finalize_subtest
 
 ts_finalize