From: Sebastien GODARD Date: Fri, 26 Apr 2019 14:42:13 +0000 (+0200) Subject: simtest: Don't add another FC host X-Git-Tag: v12.1.5~26 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=99bd3c696244eeb221377c5c876b73867715e7e9;p=sysstat simtest: Don't add another FC host Don't add another Fibre Channel host when running sysstat simulation tests. The output displayed by sar and sadf will depend on the order in which filenames are read, which is dependent on the underlying filesystem implementation, thus making tests non reproducible. Signed-off-by: Sebastien GODARD --- diff --git a/tests/expected.sadf-d b/tests/expected.sadf-d index d8b051e..3c39947 100644 --- a/tests/expected.sadf-d +++ b/tests/expected.sadf-d @@ -2235,7 +2235,6 @@ SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;0.00;0.00;0.00;0.00 SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;host0;0.00;0.00;0.00;0.00 SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;host0;0.00;0.00;0.00;0.00 SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;host0;0.00;0.00;0.00;0.00 -SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;host1;0.00;0.00;0.00;0.00 SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;host0;0.00;0.00;0.00;0.00 # hostname;interval;timestamp;CPU;total/s;dropd/s;squeezd/s;rx_rps/s;flw_lim/s SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;-1;0.00;0.00;0.00;0.00;0.00 diff --git a/tests/expected.sadf-g b/tests/expected.sadf-g index a225fe8..cf03c8b 100644 --- a/tests/expected.sadf-g +++ b/tests/expected.sadf-g @@ -1,6 +1,6 @@ - + Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/2019 _x86_64_ (8 CPU) @@ -10428,8 +10428,8 @@ 13:54:29 UTC - - + + Fibre Channel HBA statistics (2) [host0] @@ -10469,95 +10469,11 @@ 13:54:29 UTC - - - - - - -Fibre Channel HBA statistics (1) [host1] -(Min, Max values) - - -fch_rxf/s (0.00, 0.00) -fch_txf/s (0.00, 0.00) - -0.00. - -0.33. - -0.67. - -1.00. - -13:20:09 - -13:23:35 - -13:27:01 - -13:30:27 - -13:33:53 - -13:37:19 - -13:40:45 - -13:44:11 - -13:47:37 - -13:51:03 - -13:54:29 -UTC - - - - -Fibre Channel HBA statistics (2) [host1] -(Min, Max values) - - -fch_rxw/s (0.00, 0.00) -fch_txw/s (0.00, 0.00) - -0.00. - -0.33. - -0.67. - -1.00. - -13:20:09 - -13:23:35 - -13:27:01 - -13:30:27 - -13:33:53 - -13:37:19 - -13:40:45 - -13:44:11 - -13:47:37 - -13:51:03 - -13:54:29 -UTC - - + + - + Software-based network processing statistics (1) [all] (Min, Max values) @@ -10643,7 +10559,7 @@ - + Software-based network processing statistics (1) [0] (Min, Max values) @@ -10729,7 +10645,7 @@ - + Software-based network processing statistics (1) [1] (Min, Max values) @@ -10815,7 +10731,7 @@ - + Software-based network processing statistics (1) [2] (Min, Max values) @@ -10901,7 +10817,7 @@ - + Software-based network processing statistics (1) [3] (Min, Max values) @@ -10987,7 +10903,7 @@ - + Software-based network processing statistics (1) [4] (Min, Max values) @@ -11073,7 +10989,7 @@ - + Software-based network processing statistics (1) [5] (Min, Max values) @@ -11159,7 +11075,7 @@ - + Software-based network processing statistics (1) [6] (Min, Max values) @@ -11245,7 +11161,7 @@ - + Software-based network processing statistics (1) [7] (Min, Max values) @@ -11331,7 +11247,7 @@ - + Software-based network processing statistics (1) [8] (Min, Max values) @@ -11417,7 +11333,7 @@ - + Software-based network processing statistics (1) [9] (Min, Max values) @@ -11503,7 +11419,7 @@ - + CPU clock frequency [all] (Min, Max values) @@ -11544,7 +11460,7 @@ - + CPU clock frequency [0] (Min, Max values) @@ -11585,7 +11501,7 @@ - + CPU clock frequency [1] (Min, Max values) @@ -11626,7 +11542,7 @@ - + CPU clock frequency [2] (Min, Max values) @@ -11667,7 +11583,7 @@ - + CPU clock frequency [3] (Min, Max values) @@ -11708,7 +11624,7 @@ - + CPU clock frequency [4] (Min, Max values) @@ -11749,7 +11665,7 @@ - + CPU clock frequency [5] (Min, Max values) @@ -11790,7 +11706,7 @@ - + CPU clock frequency [6] (Min, Max values) @@ -11831,7 +11747,7 @@ - + CPU clock frequency [7] (Min, Max values) @@ -11872,7 +11788,7 @@ - + CPU clock frequency [8] (Min, Max values) @@ -11913,7 +11829,7 @@ - + CPU clock frequency [9] (Min, Max values) @@ -11954,7 +11870,7 @@ - + Filesystems statistics (1) [/dev/sda9] (Min, Max values) @@ -12128,7 +12044,7 @@ - + Filesystems statistics (1) [/dev/sda7] (Min, Max values) @@ -12302,7 +12218,7 @@ - + Filesystems statistics (1) [/dev/sda12] (Min, Max values) @@ -12476,7 +12392,7 @@ - + Filesystems statistics (1) [/dev/sda6] (Min, Max values) @@ -12650,7 +12566,7 @@ - + Filesystems statistics (1) [/dev/sdf] (Min, Max values) @@ -12824,7 +12740,7 @@ - + Filesystems statistics (1) [/dev/sdg] (Min, Max values) @@ -13000,5 +12916,5 @@ - + diff --git a/tests/expected.sadf-j b/tests/expected.sadf-j index b140ad5..762b320 100644 --- a/tests/expected.sadf-j +++ b/tests/expected.sadf-j @@ -2375,7 +2375,6 @@ "net-eicmp6": {"ierr6": 0.00, "idtunr6": 0.00, "odtunr6": 0.00, "itmex6": 0.00, "otmex6": 0.00, "iprmpb6": 0.00, "oprmpb6": 0.00, "iredir6": 0.00, "oredir6": 0.00, "ipck2b6": 0.00, "opck2b6": 0.00}, "net-udp6": {"idgm6": 0.00, "odgm6": 0.00, "noport6": 0.00, "idgmer6": 0.00}, "fchosts": [ - {"fchost": "host1", "fch_rxf": 0.00, "fch_txf": 0.00, "fch_rxw": 0.00, "fch_txw": 0.00}, {"fchost": "host0", "fch_rxf": 0.00, "fch_txf": 0.00, "fch_rxw": 0.00, "fch_txw": 0.00} ], "softnet": [ diff --git a/tests/expected.sadf-p b/tests/expected.sadf-p index ec983d9..5b6288c 100644 --- a/tests/expected.sadf-p +++ b/tests/expected.sadf-p @@ -3973,10 +3973,6 @@ SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC host0 fch_rxf/s 0.00 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC host0 fch_txf/s 0.00 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC host0 fch_rxw/s 0.00 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC host0 fch_txw/s 0.00 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC host1 fch_rxf/s 0.00 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC host1 fch_txf/s 0.00 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC host1 fch_rxw/s 0.00 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC host1 fch_txw/s 0.00 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC host0 fch_rxf/s 0.00 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC host0 fch_txf/s 0.00 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC host0 fch_rxw/s 0.00 diff --git a/tests/expected.sadf-r b/tests/expected.sadf-r index 25cbc43..64c8bcb 100644 --- a/tests/expected.sadf-r +++ b/tests/expected.sadf-r @@ -2326,14 +2326,13 @@ 13:20:39 UTC; idgm6/s; 671; 671; odgm6/s; 36; 36; noport6/s; 0; 0; idgmer6/s; 0; 0; # A_NET_UDP6: 1/1 (1) 13:20:49 UTC; idgm6/s; 671; 671; odgm6/s; 36; 36; noport6/s; 0; 0; idgmer6/s; 0; 0; -# A_NET_FC: 1/2 (1) +# A_NET_FC: 1/1 (1) 13:20:19 UTC; FCHOST; host0; fch_rxf/s; 16; 16; fch_txf/s; 5; 5; fch_rxw/s; 4; 4; fch_txw/s; 2; 2; -# A_NET_FC: 1/2 (1) +# A_NET_FC: 1/1 (1) 13:20:29 UTC; FCHOST; host0; fch_rxf/s; 16; 16; fch_txf/s; 5; 5; fch_rxw/s; 4; 4; fch_txw/s; 2; 2; -# A_NET_FC: 2/2 (1) +# A_NET_FC: 1/1 (1) 13:20:39 UTC; FCHOST; host0; fch_rxf/s; 16; 16; fch_txf/s; 5; 5; fch_rxw/s; 4; 4; fch_txw/s; 2; 2; -# A_NET_FC: 2/2 (1) -13:20:49 UTC; FCHOST; host1; fch_rxf/s; 16; 16; fch_txf/s; 5; 5; fch_rxw/s; 4; 4; fch_txw/s; 2; 2; +# A_NET_FC: 1/1 (1) 13:20:49 UTC; FCHOST; host0; fch_rxf/s; 16; 16; fch_txf/s; 5; 5; fch_rxw/s; 4; 4; fch_txw/s; 2; 2; # A_NET_SOFT: 9/9 (9) 13:20:19 UTC; CPU; 0; total/s; 11976; 11976; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0; @@ -3024,7 +3023,7 @@ 13:54:35 UTC; ierr6/s; 0; 0; idtunr6/s; 0; 0; odtunr6/s; 0; 0; itmex6/s; 0; 0; otmex6/s; 0; 0; iprmpb6/s; 0; 0; oprmpb6/s; 0; 0; iredir6/s; 0; 0; oredir6/s; 0; 0; ipck2b6/s; 0; 0; opck2b6/s; 0; 0; # A_NET_UDP6: 1/1 (1) 13:54:35 UTC; idgm6/s; 671; 671; odgm6/s; 36; 36; noport6/s; 0; 0; idgmer6/s; 0; 0; -# A_NET_FC: 1/2 (1) +# A_NET_FC: 1/1 (1) 13:54:35 UTC; FCHOST; host0; fch_rxf/s; 16; 16; fch_txf/s; 5; 5; fch_rxw/s; 4; 4; fch_txw/s; 2; 2; # A_NET_SOFT: 11/18 (11) 13:54:35 UTC; CPU; 0; total/s; 11976; 11976; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0; diff --git a/tests/expected.sadf-x b/tests/expected.sadf-x index 0001f3b..ec9063c 100644 --- a/tests/expected.sadf-x +++ b/tests/expected.sadf-x @@ -2487,7 +2487,6 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> - diff --git a/tests/expected.sar-all b/tests/expected.sar-all index c6fcc8a..9a4f20a 100644 --- a/tests/expected.sar-all +++ b/tests/expected.sar-all @@ -2822,7 +2822,6 @@ Average: 0.00 0.00 0.00 0.00 13:20:19 0.00 0.00 0.00 0.00 host0 13:20:29 0.00 0.00 0.00 0.00 host0 13:20:39 0.00 0.00 0.00 0.00 host0 -13:20:49 0.00 0.00 0.00 0.00 host1 13:20:49 0.00 0.00 0.00 0.00 host0 Average: 0.00 0.00 0.00 0.00 host0 diff --git a/tests/expected.sar-dec b/tests/expected.sar-dec index c812f86..27c709b 100644 --- a/tests/expected.sar-dec +++ b/tests/expected.sar-dec @@ -2822,7 +2822,6 @@ Average: 0 0 0 0 13:20:19 0 0 0 0 host0 13:20:29 0 0 0 0 host0 13:20:39 0 0 0 0 host0 -13:20:49 0 0 0 0 host1 13:20:49 0 0 0 0 host0 Average: 0 0 0 0 host0 diff --git a/tests/expected.sar-human b/tests/expected.sar-human index 9084d15..23389b6 100644 --- a/tests/expected.sar-human +++ b/tests/expected.sar-human @@ -2822,7 +2822,6 @@ Average: 0.00 0.00 0.00 0.00 13:20:19 0.00 0.00 0.00 0.00 host0 13:20:29 0.00 0.00 0.00 0.00 host0 13:20:39 0.00 0.00 0.00 0.00 host0 -13:20:49 0.00 0.00 0.00 0.00 host1 13:20:49 0.00 0.00 0.00 0.00 host0 Average: 0.00 0.00 0.00 0.00 host0 diff --git a/tests/expected2.sadf-g b/tests/expected2.sadf-g index 43089a6..0f27608 100644 --- a/tests/expected2.sadf-g +++ b/tests/expected2.sadf-g @@ -1,6 +1,6 @@ - + Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/2019 _x86_64_ (8 CPU) diff --git a/tests/expected2.sar-all b/tests/expected2.sar-all index eaabfb6..ca75e2f 100644 --- a/tests/expected2.sar-all +++ b/tests/expected2.sar-all @@ -2822,7 +2822,6 @@ Average: 0.00 0.00 0.00 0.00 13:20:19 0.00 0.00 0.00 0.00 host0 13:20:29 0.00 0.00 0.00 0.00 host0 13:20:39 0.00 0.00 0.00 0.00 host0 -13:20:49 0.00 0.00 0.00 0.00 host1 13:20:49 0.00 0.00 0.00 0.00 host0 Average: 0.00 0.00 0.00 0.00 host0 diff --git a/tests/root.README b/tests/root.README index 553f4fc..c6b0a2e 100644 --- a/tests/root.README +++ b/tests/root.README @@ -30,7 +30,7 @@ virbr0-nic: unregistered enp6s1, wlp5s1: registered /sys/class/fc_host -host2: registered +[Don't register any new hosts as the order in which filenames will be read depends on the filesystem implementation: See readdir(3). ==========root5: /proc/stat diff --git a/tests/root4/sys/class/fc_host/host1/statistics/rx_frames b/tests/root4/sys/class/fc_host/host1/statistics/rx_frames deleted file mode 100644 index f599e28..0000000 --- a/tests/root4/sys/class/fc_host/host1/statistics/rx_frames +++ /dev/null @@ -1 +0,0 @@ -10 diff --git a/tests/root4/sys/class/fc_host/host1/statistics/rx_words b/tests/root4/sys/class/fc_host/host1/statistics/rx_words deleted file mode 100644 index b8626c4..0000000 --- a/tests/root4/sys/class/fc_host/host1/statistics/rx_words +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/tests/root4/sys/class/fc_host/host1/statistics/tx_frames b/tests/root4/sys/class/fc_host/host1/statistics/tx_frames deleted file mode 100644 index 7ed6ff8..0000000 --- a/tests/root4/sys/class/fc_host/host1/statistics/tx_frames +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/tests/root4/sys/class/fc_host/host1/statistics/tx_words b/tests/root4/sys/class/fc_host/host1/statistics/tx_words deleted file mode 100644 index 0cfbf08..0000000 --- a/tests/root4/sys/class/fc_host/host1/statistics/tx_words +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/tests/root5/sys/class/fc_host/host1/statistics/rx_frames b/tests/root5/sys/class/fc_host/host1/statistics/rx_frames deleted file mode 100644 index f599e28..0000000 --- a/tests/root5/sys/class/fc_host/host1/statistics/rx_frames +++ /dev/null @@ -1 +0,0 @@ -10 diff --git a/tests/root5/sys/class/fc_host/host1/statistics/rx_words b/tests/root5/sys/class/fc_host/host1/statistics/rx_words deleted file mode 100644 index b8626c4..0000000 --- a/tests/root5/sys/class/fc_host/host1/statistics/rx_words +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/tests/root5/sys/class/fc_host/host1/statistics/tx_frames b/tests/root5/sys/class/fc_host/host1/statistics/tx_frames deleted file mode 100644 index 7ed6ff8..0000000 --- a/tests/root5/sys/class/fc_host/host1/statistics/tx_frames +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/tests/root5/sys/class/fc_host/host1/statistics/tx_words b/tests/root5/sys/class/fc_host/host1/statistics/tx_words deleted file mode 100644 index 0cfbf08..0000000 --- a/tests/root5/sys/class/fc_host/host1/statistics/tx_words +++ /dev/null @@ -1 +0,0 @@ -2