iostat: Add ng tests for flush I/Os statistics

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>

diff --git a/tests/expected.iostat-x-ALL-p-ALL b/tests/expected.iostat-x-ALL-p-ALL
index 726bec68b7c38857c7f14dfd815ece6025b927e3..462ec3270e1c490016ba81543cd45fa7661dca9c 100644 (file)
--- a/tests/expected.iostat-x-ALL-p-ALL
+++ b/tests/expected.iostat-x-ALL-p-ALL
@@ -60,7 +60,7 @@ sda12            0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.
 scd0             0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sdb              0.67     22.60     0.00   0.00   47.00    33.62    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.10   0.05
 sde              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
-sdc              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
+sdc              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    1.02   67.03    0.00   0.00
 sdd              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 
 
@@ -80,7 +80,7 @@ sda11            0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.
 sda12            0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 scd0             0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sde              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
-sdc              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
+sdc              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.62   51.29    0.00   0.00
 sdd              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sdf              1.22     54.34     0.00   0.00   62.51    44.51    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.08   0.09
 sdg              2.83    114.91     0.03   0.91   25.06    40.59    0.08      0.31     0.00   0.00   13.33     4.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.07   0.19
@@ -102,7 +102,7 @@ sda11            0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.
 sda12            0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 scd0             0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sde              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
-sdc              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
+sdc              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    1.12   89.28    0.00   0.00
 sdd              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sdf              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sdg              0.89     22.33     0.22  20.00    5.00    25.00    0.04      0.22     0.00   0.00   30.00     5.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.04   0.09

diff --git a/tests/root.README b/tests/root.README
index cc208796f31cb40ec20734f108a5b20ee1ea5f95..3efda9979e9f0f174e920c762246890c517cf37d 100644 (file)
--- a/tests/root.README
+++ b/tests/root.README
@@ -17,6 +17,7 @@ CPU#6: offline
 /proc/diskstats
 sda, sda1: counters increase
 sdb: unregistered then registered again
+sdc: flush I/Os stats
 
 /proc/net/dev
 enp6s0: unregistered then registered again
@@ -34,6 +35,7 @@ CPU#6: offline
 /proc/diskstats
 sda, sda1: counters decrease
 sdb (dev8-16): unregistered
+sdc: flush I/Os stats
 sdf (dev8-80), sdg (dev-8,96): registered
 
 /proc/net/dev
@@ -49,6 +51,9 @@ CIFS SMB1 and SMB2 statistics available
 /proc/stat
 CPU#6: online
 
+/proc/diskstats
+sdc: flush I/Os stats
+
 CIFS SMB1 and SMB2 statistics available
 
 ==========root6:

diff --git a/tests/root3/proc/diskstats b/tests/root3/proc/diskstats
index 3e4b736bfac2d0be5102ee603ab932b89cd1b454..e5b6e5fcefdfc545cfdaf4705e85878a226a30dd 100644 (file)
--- a/tests/root3/proc/diskstats
+++ b/tests/root3/proc/diskstats
@@ -14,5 +14,5 @@
   11       0 sr0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
    8      16 sdb 21 0 1412 987 0 0 0 0 0 17 3000 0 0 0 0
    8      64 sde 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-   8      32 sdc 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+   8      32 sdc 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 32 2145
    8      48 sdd 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0

diff --git a/tests/root4/proc/diskstats b/tests/root4/proc/diskstats
index ecfb739a1b137354e4db9a62d67cb6d1ec73145b..982822c7d8e8c5c78d5199f75388a1cfdb1529d0 100644 (file)
--- a/tests/root4/proc/diskstats
+++ b/tests/root4/proc/diskstats
@@ -13,7 +13,7 @@
    8      12 sda12 8748 687 363650 124848 4780 7593 534960 59590 0 7316 178474 0 0 0 0
   11       0 sr0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
    8      64 sde 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-   8      32 sdc 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+   8      32 sdc 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 56 3376
    8      48 sdd 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
    8      80 sdf 47 0 4184 2938 0 0 0 0 0 33 2917 0 0 0 0
    8      96 sdg 109 1 8848 2732 3 0 24 40 0 73 2724 0 0 0 0

diff --git a/tests/root5/proc/diskstats b/tests/root5/proc/diskstats
index c3f49aa04567592988c5d5dd29563a7dac5b1de5..299fc6041ac97504ae569414fa205a7a6e273780 100644 (file)
--- a/tests/root5/proc/diskstats
+++ b/tests/root5/proc/diskstats
@@ -13,7 +13,7 @@
    8      12 sda12 8748 687 363650 124848 4780 7593 534960 59590 0 7316 178474 0 0 0 0
   11       0 sr0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
    8      64 sde 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-   8      32 sdc 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+   8      32 sdc 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 81 5608
    8      48 sdd 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
    8      80 sdf 47 0 4184 2938 0 0 0 0 0 33 2917 0 0 0 0
    8      96 sdg 129 6 9848 2832 4 0 34 70 0 93 3724 0 0 0 0