From 36fbccd12394f23c4add0d53e6d03937f0e4ad13 Mon Sep 17 00:00:00 2001 From: Sebastien GODARD Date: Fri, 30 Dec 2022 09:20:17 +0100 Subject: [PATCH] Update non regression tests Signed-off-by: Sebastien GODARD --- tests/00191 | 2 +- tests/00193 | 1 + tests/TLIST | 1 + tests/expected.data-11.6.5-sadf-x | 6 +- tests/expected.data-wghfreq-sadf-x | 6 +- tests/expected.sadf-H | 3 +- tests/expected.sadf-d | 8 + tests/expected.sadf-g | 112 +++++++- tests/expected.sadf-j | 14 + tests/expected.sadf-p | 18 ++ tests/expected.sadf-r | 17 ++ tests/expected.sadf-x | 20 +- tests/expected.sar-dec | 9 + tests/expected.sar-human | 9 + tests/expected.sar32-A | 6 + tests/expected0.sadf-x | 6 +- tests/expected1.sadf-x | 6 +- tests/expected1.sar-always | 9 + tests/expected2.sadf-g | 268 ++++++++++++------ tests/expected2.sar-all | 9 + tests/expected2.sar-always | 13 + tests/expected2.sar32-A | 8 + tests/expected3.sar-all | 9 + .../sys/class/power_supply/BAT0/capacity | 1 + .../root1/sys/class/power_supply/BAT0/status | 1 + .../sys/class/power_supply/BAT1/capacity | 1 + .../root1/sys/class/power_supply/BAT1/status | 1 + tests/root1/sys/class/power_supply/_list | 4 + tests/root2/root1 | 1 + tests/root2/root2 | 1 + .../sys/class/power_supply/BAT0/capacity | 1 + .../root2/sys/class/power_supply/BAT0/status | 1 + .../sys/class/power_supply/BAT1/capacity | 1 + .../root2/sys/class/power_supply/BAT1/status | 1 + tests/root2/sys/class/power_supply/_list | 4 + .../sys/class/power_supply/BAT0/capacity | 1 + .../root3/sys/class/power_supply/BAT0/status | 1 + .../sys/class/power_supply/BAT1/capacity | 1 + .../root3/sys/class/power_supply/BAT1/status | 1 + tests/root3/sys/class/power_supply/_list | 4 + .../sys/class/power_supply/BAT0/capacity | 1 + .../root4/sys/class/power_supply/BAT0/status | 1 + tests/root4/sys/class/power_supply/_list | 3 + .../sys/class/power_supply/BAT0/capacity | 1 + .../root5/sys/class/power_supply/BAT0/status | 1 + tests/root5/sys/class/power_supply/_list | 3 + 46 files changed, 487 insertions(+), 109 deletions(-) create mode 100644 tests/00193 create mode 100644 tests/expected2.sar-always create mode 100644 tests/root1/sys/class/power_supply/BAT0/capacity create mode 100644 tests/root1/sys/class/power_supply/BAT0/status create mode 100644 tests/root1/sys/class/power_supply/BAT1/capacity create mode 100644 tests/root1/sys/class/power_supply/BAT1/status create mode 100644 tests/root1/sys/class/power_supply/_list create mode 120000 tests/root2/root1 create mode 120000 tests/root2/root2 create mode 100644 tests/root2/sys/class/power_supply/BAT0/capacity create mode 100644 tests/root2/sys/class/power_supply/BAT0/status create mode 100644 tests/root2/sys/class/power_supply/BAT1/capacity create mode 100644 tests/root2/sys/class/power_supply/BAT1/status create mode 100644 tests/root2/sys/class/power_supply/_list create mode 100644 tests/root3/sys/class/power_supply/BAT0/capacity create mode 100644 tests/root3/sys/class/power_supply/BAT0/status create mode 100644 tests/root3/sys/class/power_supply/BAT1/capacity create mode 100644 tests/root3/sys/class/power_supply/BAT1/status create mode 100644 tests/root3/sys/class/power_supply/_list create mode 100644 tests/root4/sys/class/power_supply/BAT0/capacity create mode 100644 tests/root4/sys/class/power_supply/BAT0/status create mode 100644 tests/root4/sys/class/power_supply/_list create mode 100644 tests/root5/sys/class/power_supply/BAT0/capacity create mode 100644 tests/root5/sys/class/power_supply/BAT0/status create mode 100644 tests/root5/sys/class/power_supply/_list diff --git a/tests/00191 b/tests/00191 index 75450d8..ca77928 100644 --- a/tests/00191 +++ b/tests/00191 @@ -1 +1 @@ -LC_ALL=C TZ=GMT S_TIME_FORMAT= S_COLORS=always S_COLORS_SGR="C=33;22:X=31;1:I=32;22:W=35;1:N=34;1:R=31;22:Z=36;22" ./sar -q MEM -Bu -P 0,3 -d --dev=sda --getenv -f tests/data-new.tmp > tests/out1.sar-always.tmp && diff -u tests/expected1.sar-always tests/out1.sar-always.tmp +LC_ALL=C TZ=GMT S_TIME_FORMAT= S_COLORS=always S_COLORS_SGR="C=33;22:X=31;1:I=32;22:W=35;1:N=34;1:R=31;22:Z=36;22" ./sar -q MEM -m BAT -Bu -P 0,3 -d --dev=sda --getenv -f tests/data-new.tmp > tests/out1.sar-always.tmp && diff -u tests/expected1.sar-always tests/out1.sar-always.tmp diff --git a/tests/00193 b/tests/00193 new file mode 100644 index 0000000..c230903 --- /dev/null +++ b/tests/00193 @@ -0,0 +1 @@ +LC_ALL=C TZ=GMT S_TIME_FORMAT= S_COLORS=always S_COLORS_SGR="+=33;22:-=35;1" ./sar -m BAT --getenv -f tests/data-new.tmp > tests/out2.sar-always.tmp && diff -u tests/expected2.sar-always tests/out2.sar-always.tmp diff --git a/tests/TLIST b/tests/TLIST index 8ba554a..0ee3632 100644 --- a/tests/TLIST +++ b/tests/TLIST @@ -87,6 +87,7 @@ NOTES: 00190 LC_ALL=C TZ=GMT S_TIME_FORMAT= S_COLORS=always S_COLORS_SGR="C=33;22:H=31;1:I=32;22:M=35;1:N=34;1:R=31;22:Z=36;22" ./sar -C -u --getenv -f tests/data.tmp > tests/out.sar-always.tmp 00191 LC_ALL=C TZ=GMT S_TIME_FORMAT= S_COLORS=always S_COLORS_SGR="C=33;22:X=31;1:I=32;22:W=35;1:N=34;1:R=31;22:Z=36;22" ./sar -q MEM -Bu -P 0,3 -d --dev=sda --getenv -f tests/data-new.tmp > tests/out1.sar-always.tmp 00192 LC_ALL=C TZ=GMT S_REPEAT_HEADER=2 ./sar --getenv -f tests/data-new.tmp > tests/out.sar-rep_hdr.tmp +00193 LC_ALL=C TZ=GMT S_TIME_FORMAT= S_COLORS=always S_COLORS_SGR="+=33;22:-=35;1" ./sar -m BAT --getenv -f tests/data-new.tmp > tests/out2.sar-always.tmp ===== sar: Playing with sa1 and sa2 shell scripts 00200 TZ=GMT ./sa1 --boot; TZ=GMT ./sa1 --unix_time=1555593629 1 1; TZ=GMT ./sa1 --unix_time=1555593649 1 1 diff --git a/tests/expected.data-11.6.5-sadf-x b/tests/expected.data-11.6.5-sadf-x index 9ab319b..51c528d 100644 --- a/tests/expected.data-11.6.5-sadf-x +++ b/tests/expected.data-11.6.5-sadf-x @@ -1,11 +1,11 @@ - + - 3.12 + 3.13 Linux 4.17.18-200.fc28.x86_64 diff --git a/tests/expected.data-wghfreq-sadf-x b/tests/expected.data-wghfreq-sadf-x index eaae30f..05c5896 100644 --- a/tests/expected.data-wghfreq-sadf-x +++ b/tests/expected.data-wghfreq-sadf-x @@ -1,11 +1,11 @@ - + - 3.12 + 3.13 Linux 1.2.3-TEST diff --git a/tests/expected.sadf-H b/tests/expected.sadf-H index c38dcfc..d1a148d 100644 --- a/tests/expected.sadf-H +++ b/tests/expected.sadf-H @@ -8,7 +8,7 @@ Timezone: GMT File composition: (1,1,12),(0,0,9),(2,0,1) Size of a long int: 8 HZ = 100 -Number of activities in file: 38 +Number of activities in file: 39 Extra structures available: N List of activities: 01: [8b] A_CPU Y: 10 (10,0,0) @@ -44,6 +44,7 @@ List of activities: 38: [8a] A_NET_FC Y: 1 (0,4,0) 39: [8a] A_NET_SOFT Y: 10 (0,0,6) 30: [8a] A_PWR_CPU Y: 10 (0,1,0) +43: [8a] A_PWR_BAT Y: 2 (0,0,0) 36: [8a] A_PWR_USB Y: 2 (0,0,4) 37: [8b] A_FS Y: 4 (5,0,0) 40: [8a] A_PSI_CPU N: 1 (1,3,0) diff --git a/tests/expected.sadf-d b/tests/expected.sadf-d index 50f90e4..ee8e1a0 100644 --- a/tests/expected.sadf-d +++ b/tests/expected.sadf-d @@ -551,6 +551,13 @@ SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;4;3505.84 SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;5;3493.55 SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;6;3492.22 SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;7;3497.56 +# hostname;interval;timestamp;BAT;%cap;cap/min;status +SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;0;100;0.00;Full +SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;1;83;-3.85;Unknown +SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;0;70;-57.62;Unknown +SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;1;80;-5.76;Discharging +SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;0;75;7.79;Charging +SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;0;77;5.36;NotCharging # hostname;interval;timestamp;manufact;product;BUS;idvendor;idprod;maxpower SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;1;3f0;862;196;HP;HP Wireless Keyboard Mouse Kit SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;3;174c;55aa;0;ASMT;ASM1153 @@ -769,6 +776,7 @@ SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;6;3492.22 SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;7;3497.56 SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;8;3497.56 SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;9;3497.56 +# hostname;interval;timestamp;BAT;%cap;cap/min;status # hostname;interval;timestamp;manufact;product;BUS;idvendor;idprod;maxpower # hostname;interval;timestamp;FILESYSTEM;MBfsfree;MBfsused;%fsused;%ufsused;Ifree;Iused;%Iused SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;/dev/sda9;705;145;17.04;18.92;6008414;102818;1.68 diff --git a/tests/expected.sadf-g b/tests/expected.sadf-g index 237185b..5a71dd9 100644 --- a/tests/expected.sadf-g +++ b/tests/expected.sadf-g @@ -1,6 +1,6 @@ - + Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (9 CPU) @@ -14429,7 +14429,97 @@ - + + +Batteries capacity [BAT0] +(Min, Max values) + + +%cap (70, 100) + +0. + +25. + +50. + +75. + +100. + +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 + + + + + + + +Batteries capacity [BAT1] +(Min, Max values) + + +%cap (80, 83) + +0. + +25. + +50. + +75. + +100. + +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 + + + + + + Filesystems statistics (1) [/dev/sda9] (Min, Max values) @@ -14603,7 +14693,7 @@ - + Filesystems statistics (1) [/dev/sda7] (Min, Max values) @@ -14777,7 +14867,7 @@ - + Filesystems statistics (1) [/dev/sda12] (Min, Max values) @@ -14951,7 +15041,7 @@ - + Filesystems statistics (1) [/dev/sda6] (Min, Max values) @@ -15125,7 +15215,7 @@ - + Filesystems statistics (1) [/dev/sdf] (Min, Max values) @@ -15299,7 +15389,7 @@ - + Filesystems statistics (1) [/dev/sdg] (Min, Max values) @@ -15473,7 +15563,7 @@ - + CPU pressure trends (some tasks) (Min, Max values) @@ -15561,7 +15651,7 @@ - + I/O pressure trends (some tasks) (Min, Max values) @@ -15735,7 +15825,7 @@ - + Memory pressure trends (some tasks) (Min, Max values) @@ -15909,5 +15999,5 @@ - + diff --git a/tests/expected.sadf-j b/tests/expected.sadf-j index 5f87649..ed99196 100644 --- a/tests/expected.sadf-j +++ b/tests/expected.sadf-j @@ -159,6 +159,10 @@ {"number": "5", "frequency": 3493.55}, {"number": "6", "frequency": 3492.22}, {"number": "7", "frequency": 3497.56} + ], + "battery": [ + {"number": 0, "percent-capacity": 100, "variation": 0.00, "status": "Full"}, + {"number": 1, "percent-capacity": 83, "variation": -3.85, "status": "Unknown"} ] }, "filesystems": [ @@ -321,6 +325,10 @@ {"number": "6", "frequency": 3492.22}, {"number": "7", "frequency": 3497.56} ], + "battery": [ + {"number": 0, "percent-capacity": 70, "variation": -57.62, "status": "Unknown"}, + {"number": 1, "percent-capacity": 80, "variation": -5.76, "status": "Discharging"} + ], "usb-devices": [ {"bus_number": 1, "idvendor": "3f0", "idprod": "862", "maxpower": 196, "manufact": "HP", "product": "HP Wireless Keyboard Mouse Kit"}, {"bus_number": 3, "idvendor": "174c", "idprod": "55aa", "maxpower": 0, "manufact": "ASMT", "product": "ASM1153"} @@ -490,6 +498,9 @@ {"number": "5", "frequency": 3493.55}, {"number": "6", "frequency": 3492.22}, {"number": "7", "frequency": 3497.56} + ], + "battery": [ + {"number": 0, "percent-capacity": 75, "variation": 7.79, "status": "Charging"} ] }, "filesystems": [ @@ -664,6 +675,9 @@ {"number": "6", "frequency": 3492.22}, {"number": "7", "frequency": 3497.56} ], + "battery": [ + {"number": 0, "percent-capacity": 77, "variation": 5.36, "status": "NotCharging"} + ], "usb-devices": [ {"bus_number": 1, "idvendor": "3f0", "idprod": "862", "maxpower": 196, "manufact": "HP", "product": "HP Wireless Keyboard Mouse Kit"}, {"bus_number": 3, "idvendor": "174c", "idprod": "55aa", "maxpower": 0, "manufact": "ASMT", "product": "ASM1153"}, diff --git a/tests/expected.sadf-p b/tests/expected.sadf-p index 3039d12..d29130a 100644 --- a/tests/expected.sadf-p +++ b/tests/expected.sadf-p @@ -4024,6 +4024,24 @@ SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC cpu4 MHz 3505.84 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC cpu5 MHz 3493.55 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC cpu6 MHz 3492.22 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC cpu7 MHz 3497.56 +SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC BAT0 %cap 100 +SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC BAT0 cap/min 0.00 +SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC BAT0 status Full +SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC BAT1 %cap 83 +SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC BAT1 cap/min -3.85 +SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC BAT1 status Unknown +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC BAT0 %cap 70 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC BAT0 cap/min -57.62 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC BAT0 status Unknown +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC BAT1 %cap 80 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC BAT1 cap/min -5.76 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC BAT1 status Discharging +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC BAT0 %cap 75 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC BAT0 cap/min 7.79 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC BAT0 status Charging +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC BAT0 %cap 77 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC BAT0 cap/min 5.36 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC BAT0 status NotCharging SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC bus1 idvendor 3f0 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC bus1 idprod 862 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC bus1 maxpower 196 diff --git a/tests/expected.sadf-r b/tests/expected.sadf-r index c1177a0..3b60f17 100644 --- a/tests/expected.sadf-r +++ b/tests/expected.sadf-r @@ -829,6 +829,21 @@ 13:20:49 UTC; CPU; 7; MHz; 349756; # uptime_cs; 0; ust_time; 1555594649; extra_next; 0; record_type; 2; HH:MM:SS; 13:37:29 # uptime_cs; 722372; ust_time; 1555593619; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:19 +# name; A_PWR_BAT; nr_curr; 2; nr_alloc; 2; nr_ini; 2 +13:20:19 UTC; BAT; 0; %cap; 100; 100; status; 4 [Full]; +13:20:19 UTC; BAT; 1; %cap; 85; 83; status; 0 [Unknown]; +# uptime_cs; 725496; ust_time; 1555593629; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:29 +# name; A_PWR_BAT; nr_curr; 2; nr_alloc; 2; nr_ini; 2 +13:20:29 UTC; BAT; 0; %cap; 100; 70; status; 0 [Unknown]; +13:20:29 UTC; BAT; 1; %cap; 83; 80; status; 2 [Discharging]; +# uptime_cs; 729346; ust_time; 1555593639; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:39 +# name; A_PWR_BAT; nr_curr; 1; nr_alloc; 2; nr_ini; 2 +13:20:39 UTC; BAT; 0; %cap; 70; 75; status; 1 [Charging]; +# uptime_cs; 731585; ust_time; 1555593649; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:49 +# name; A_PWR_BAT; nr_curr; 1; nr_alloc; 2; nr_ini; 2 +13:20:49 UTC; BAT; 0; %cap; 75; 77; status; 3 [NotCharging]; +# uptime_cs; 0; ust_time; 1555594649; extra_next; 0; record_type; 2; HH:MM:SS; 13:37:29 +# uptime_cs; 722372; ust_time; 1555593619; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:19 # name; A_PWR_USB; nr_curr; 0; nr_alloc; 4; nr_ini; 2 # uptime_cs; 725496; ust_time; 1555593629; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:29 # name; A_PWR_USB; nr_curr; 2; nr_alloc; 4; nr_ini; 2 @@ -1123,6 +1138,8 @@ 13:54:35 UTC; CPU; 8; MHz; 349756; 13:54:35 UTC; CPU; 9; MHz; 349756; # uptime_cs; 722372; ust_time; 1555595675; extra_next; 0; record_type; 1; HH:MM:SS; 13:54:35 +# name; A_PWR_BAT; nr_curr; 0; nr_alloc; 2; nr_ini; 2 +# uptime_cs; 722372; ust_time; 1555595675; extra_next; 0; record_type; 1; HH:MM:SS; 13:54:35 # name; A_PWR_USB; nr_curr; 0; nr_alloc; 4; nr_ini; 2 # uptime_cs; 722372; ust_time; 1555595675; extra_next; 0; record_type; 1; HH:MM:SS; 13:54:35 # name; A_FS; nr_curr; 4; nr_alloc; 8; nr_ini; 4 diff --git a/tests/expected.sadf-x b/tests/expected.sadf-x index 172b08f..9c07c3a 100644 --- a/tests/expected.sadf-x +++ b/tests/expected.sadf-x @@ -1,11 +1,11 @@ - + - 3.12 + 3.13 Linux 1.2.3-TEST @@ -543,6 +543,10 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> + + + + @@ -1038,6 +1042,10 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> + + + + @@ -1586,6 +1594,9 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> + + + @@ -2181,6 +2192,9 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> + + + diff --git a/tests/expected.sar-dec b/tests/expected.sar-dec index 79e5be2..2ae96ef 100644 --- a/tests/expected.sar-dec +++ b/tests/expected.sar-dec @@ -731,6 +731,15 @@ Average: 5 3494 Average: 6 3492 Average: 7 3498 +13:20:09 BAT %cap cap/min status +13:20:19 0 100 +0 ↑ +13:20:19 1 83 -4 ? +13:20:29 0 70 -58 ? +13:20:29 1 80 -6 ↘ +13:20:39 0 75 +8 ↗ +13:20:49 0 77 +5 → +Average: 0 80 -11 + 13:20:09 BUS idvendor idprod maxpower manufact product 13:20:29 1 3f0 862 196 HP HP Wireless Keyboard Mouse Kit 13:20:29 3 174c 55aa 0 ASMT ASM1153 diff --git a/tests/expected.sar-human b/tests/expected.sar-human index fa07f92..d116a86 100644 --- a/tests/expected.sar-human +++ b/tests/expected.sar-human @@ -731,6 +731,15 @@ Average: 5 3493.55 Average: 6 3492.22 Average: 7 3497.56 +13:20:09 BAT %cap cap/min status +13:20:19 0 100% +0.00 ↑ +13:20:19 1 83% -3.85 ? +13:20:29 0 70% -57.62 ? +13:20:29 1 80% -5.76 ↘ +13:20:39 0 75% +7.79 ↗ +13:20:49 0 77% +5.36 → +Average: 0 80.5% -11.19 + 13:20:09 BUS idvendor idprod maxpower manufact product 13:20:29 1 3f0 862 196 HP HP Wireless Keyboard Mouse Kit 13:20:29 3 174c 55aa 0 ASMT ASM1153 diff --git a/tests/expected.sar32-A b/tests/expected.sar32-A index 5b9f447..675c1bb 100644 --- a/tests/expected.sar32-A +++ b/tests/expected.sar32-A @@ -331,6 +331,12 @@ Average: 5 3493.55 Average: 6 3492.22 Average: 7 3497.56 +13:20:29 BAT %cap cap/min status +13:20:39 0 100 +0.00 ↑ +13:20:39 1 83 -3.85 ? +Average: 0 100.00 +0.00 +Average: 1 83.00 -3.85 + 13:20:29 MBfsfree MBfsused %fsused %ufsused Ifree Iused %Iused FILESYSTEM 13:20:39 705 145 17.04 18.92 6008414 102818 1.68 /dev/sda9 13:20:39 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sda7 diff --git a/tests/expected0.sadf-x b/tests/expected0.sadf-x index cf777db..65c2434 100644 --- a/tests/expected0.sadf-x +++ b/tests/expected0.sadf-x @@ -1,11 +1,11 @@ - + - 3.12 + 3.13 Linux 1.2.3-TEST diff --git a/tests/expected1.sadf-x b/tests/expected1.sadf-x index cafe9f8..913cedf 100644 --- a/tests/expected1.sadf-x +++ b/tests/expected1.sadf-x @@ -1,11 +1,11 @@ - + - 3.12 + 3.13 Linux 1.2.3-TEST diff --git a/tests/expected1.sar-always b/tests/expected1.sar-always index d7b9211..ed9e856 100644 --- a/tests/expected1.sar-always +++ b/tests/expected1.sar-always @@ -26,6 +26,15 @@ Average:  0.00 0.00 0.00[3 13:20:49  sda 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 Average:  sda 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:20:09 BAT %cap cap/min status +13:20:19  0 100 +0.00 ↑ +13:20:19  1 83 -3.85 ? +13:20:29  0 70 -57.62 ? +13:20:29  1 80 -5.76 ↘ +13:20:39  0 75 +7.79 ↗ +13:20:49  0 77 +5.36 → +Average:  0 80.50 -11.19 + 13:20:09 %smem-10 %smem-60 %smem-300 %smem %fmem-10 %fmem-60 %fmem-300 %fmem 13:20:19  3.12 1.40 0.03 0.05 0.00 0.00 0.00 0.02 13:20:29  21.06 14.31 3.80 0.03 0.00 0.00 0.00 0.01 diff --git a/tests/expected2.sadf-g b/tests/expected2.sadf-g index 523cde9..491e924 100644 --- a/tests/expected2.sadf-g +++ b/tests/expected2.sadf-g @@ -1,6 +1,6 @@ - + Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (9 CPU) @@ -65,15 +65,17 @@ Software-based network processing statistics CPU clock frequency + +Batteries capacity -Filesystems statistics +Filesystems statistics -Pressure-stall CPU statistics +Pressure-stall CPU statistics -Pressure-stall I/O statistics +Pressure-stall I/O statistics -Pressure-stall memory statistics - +Pressure-stall memory statistics + CPU utilization [all] (Min, Max values) @@ -161,7 +163,7 @@ - + CPU utilization [0] (Min, Max values) @@ -240,7 +242,7 @@ - + CPU utilization [1] (Min, Max values) @@ -316,7 +318,7 @@ - + CPU utilization [2] (Min, Max values) @@ -395,7 +397,7 @@ - + CPU utilization [3] (Min, Max values) @@ -474,7 +476,7 @@ - + CPU utilization [4] (Min, Max values) @@ -553,7 +555,7 @@ - + CPU utilization [5] (Min, Max values) @@ -629,7 +631,7 @@ - + CPU utilization [6] (Min, Max values) @@ -708,7 +710,7 @@ - + CPU utilization [7] (Min, Max values) @@ -784,7 +786,7 @@ - + CPU utilization [8] (Min, Max values) @@ -872,7 +874,7 @@ - + CPU utilization [9] (Min, Max values) @@ -951,7 +953,7 @@ - + Task creation (Min, Max values) @@ -1049,7 +1051,7 @@ - + Paging activity (3) (Min, Max values) @@ -1105,7 +1107,7 @@ - + I/O and transfer rate statistics (1) (Min, Max values) @@ -1211,7 +1213,7 @@ - + Memory utilization (1) (Min, Max values) @@ -1519,7 +1521,7 @@ - + Swap utilization (1) (Min, Max values) @@ -1571,7 +1573,7 @@ - + Kernel tables statistics (1) (Min, Max values) @@ -1671,7 +1673,7 @@ - + Queue length (Min, Max values) @@ -1817,7 +1819,7 @@ - + Block devices statistics (1) [sda] (Min, Max values) @@ -2061,7 +2063,7 @@ - + Block devices statistics (1) [sda1] (Min, Max values) @@ -2309,7 +2311,7 @@ - + Block devices statistics (1) [sdb] (Min, Max values) @@ -2553,7 +2555,7 @@ - + Block devices statistics (1) [sdq] (Min, Max values) @@ -2795,7 +2797,7 @@ - + Block devices statistics (1) [sdr] (Min, Max values) @@ -3041,7 +3043,7 @@ - + Block devices statistics (1) [sds] (Min, Max values) @@ -3285,7 +3287,7 @@ - + Block devices statistics (1) [sdf] (Min, Max values) @@ -3533,7 +3535,7 @@ - + Block devices statistics (1) [sdg] (Min, Max values) @@ -3775,7 +3777,7 @@ - + Block devices statistics (1) [cciss/c0d0] (Min, Max values) @@ -3869,7 +3871,7 @@ - + Block devices statistics (1) [cciss/c0d0p2] (Min, Max values) @@ -3963,7 +3965,7 @@ - + Block devices statistics (1) [xvdp] (Min, Max values) @@ -4209,7 +4211,7 @@ - + Block devices statistics (1) [xvdiw] (Min, Max values) @@ -4455,7 +4457,7 @@ - + Network interfaces statistics (1) [enp6s0] (Min, Max values) @@ -4655,7 +4657,7 @@ - + Network interfaces statistics (1) [virbr0] (Min, Max values) @@ -4803,7 +4805,7 @@ - + Network interfaces statistics (1) [virbr0-1] (Min, Max values) @@ -4951,7 +4953,7 @@ - + Network interfaces statistics (1) [wlp5s0] (Min, Max values) @@ -5099,7 +5101,7 @@ - + Network interfaces statistics (1) [enp6s1] (Min, Max values) @@ -5253,7 +5255,7 @@ - + Network interfaces statistics (1) [wlp5s1] (Min, Max values) @@ -5351,7 +5353,7 @@ - + Network interfaces statistics (1) [enp6s2] (Min, Max values) @@ -5501,7 +5503,7 @@ - + Network interfaces statistics (1) [wlp5s2] (Min, Max values) @@ -5599,7 +5601,7 @@ - + Network interfaces errors statistics (4) [virbr0] (Min, Max values) @@ -5651,7 +5653,7 @@ - + Network interfaces errors statistics (4) [virbr0-1] (Min, Max values) @@ -5703,7 +5705,7 @@ - + Network interfaces errors statistics (2) [wlp5s0] (Min, Max values) @@ -5753,7 +5755,7 @@ - + Network interfaces errors statistics (4) [wlp5s1] (Min, Max values) @@ -5805,7 +5807,7 @@ - + IPv4 sockets statistics (1) (Min, Max values) @@ -5907,7 +5909,7 @@ - + IPv6 sockets statistics (Min, Max values) @@ -5961,7 +5963,7 @@ - + Fibre Channel HBA statistics (1) [host1] (Min, Max values) @@ -6059,7 +6061,7 @@ - + Software-based network processing statistics (1) [all] (Min, Max values) @@ -6209,7 +6211,7 @@ - + Software-based network processing statistics (2) [1] (Min, Max values) @@ -6309,7 +6311,7 @@ - + Software-based network processing statistics (2) [2] (Min, Max values) @@ -6361,7 +6363,7 @@ - + Software-based network processing statistics (2) [3] (Min, Max values) @@ -6413,7 +6415,7 @@ - + Software-based network processing statistics (2) [4] (Min, Max values) @@ -6465,7 +6467,7 @@ - + Software-based network processing statistics (2) [5] (Min, Max values) @@ -6519,7 +6521,7 @@ - + Software-based network processing statistics (2) [6] (Min, Max values) @@ -6621,7 +6623,7 @@ - + Software-based network processing statistics (2) [7] (Min, Max values) @@ -6673,7 +6675,7 @@ - + Software-based network processing statistics (1) [8] (Min, Max values) @@ -6775,7 +6777,7 @@ - + Software-based network processing statistics (2) [9] (Min, Max values) @@ -6827,7 +6829,7 @@ - + CPU clock frequency [all] (Min, Max values) @@ -6875,7 +6877,7 @@ - + CPU clock frequency [0] (Min, Max values) @@ -6923,7 +6925,7 @@ - + CPU clock frequency [1] (Min, Max values) @@ -6971,7 +6973,7 @@ - + CPU clock frequency [2] (Min, Max values) @@ -7019,7 +7021,7 @@ - + CPU clock frequency [3] (Min, Max values) @@ -7067,7 +7069,7 @@ - + CPU clock frequency [4] (Min, Max values) @@ -7115,7 +7117,7 @@ - + CPU clock frequency [5] (Min, Max values) @@ -7163,7 +7165,7 @@ - + CPU clock frequency [6] (Min, Max values) @@ -7211,7 +7213,7 @@ - + CPU clock frequency [7] (Min, Max values) @@ -7259,7 +7261,7 @@ - + CPU clock frequency [8] (Min, Max values) @@ -7307,7 +7309,7 @@ - + CPU clock frequency [9] (Min, Max values) @@ -7355,7 +7357,111 @@ - + + +Batteries capacity [BAT0] +(Min, Max values) + + +%cap (70, 100) +SYSSTAT.TEST +04/18/19 + + +0. + +25. + +50. + +75. + +100. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 +GMT + + + + + + + +Batteries capacity [BAT1] +(Min, Max values) + + +%cap (80, 83) +SYSSTAT.TEST +04/18/19 + + +0. + +25. + +50. + +75. + +100. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 +GMT + + + + + + Filesystems statistics (1) [/dev/sda9] (Min, Max values) @@ -7557,7 +7663,7 @@ - + Filesystems statistics (1) [/dev/sda7] (Min, Max values) @@ -7759,7 +7865,7 @@ - + Filesystems statistics (1) [/dev/sda12] (Min, Max values) @@ -7961,7 +8067,7 @@ - + Filesystems statistics (1) [/dev/sda6] (Min, Max values) @@ -8163,7 +8269,7 @@ - + Filesystems statistics (1) [/dev/sdf] (Min, Max values) @@ -8365,7 +8471,7 @@ - + Filesystems statistics (1) [/dev/sdg] (Min, Max values) @@ -8567,7 +8673,7 @@ - + CPU stall time (some tasks) (Min, Max values) @@ -8619,7 +8725,7 @@ - + I/O pressure trends (some tasks) (Min, Max values) @@ -8821,7 +8927,7 @@ - + Memory pressure trends (some tasks) (Min, Max values) @@ -8973,5 +9079,5 @@ - + diff --git a/tests/expected2.sar-all b/tests/expected2.sar-all index 5ae9201..51b6929 100644 --- a/tests/expected2.sar-all +++ b/tests/expected2.sar-all @@ -731,6 +731,15 @@ Average: 5 3493.55 Average: 6 3492.22 Average: 7 3497.56 +13:20:09 BAT %cap cap/min status +13:20:19 0 100 +0.00 ↑ +13:20:19 1 83 -3.85 ? +13:20:29 0 70 -57.62 ? +13:20:29 1 80 -5.76 ↘ +13:20:39 0 75 +7.79 ↗ +13:20:49 0 77 +5.36 → +Average: 0 80.50 -11.19 + 13:20:09 BUS idvendor idprod maxpower manufact product 13:20:29 1 3f0 862 196 HP HP Wireless Keyboard Mouse Kit 13:20:29 3 174c 55aa 0 ASMT ASM1153 diff --git a/tests/expected2.sar-always b/tests/expected2.sar-always new file mode 100644 index 0000000..7c4bc88 --- /dev/null +++ b/tests/expected2.sar-always @@ -0,0 +1,13 @@ +Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (9 CPU) + +13:20:09 BAT %cap cap/min status +13:20:19  0 100 +0.00 ↑ +13:20:19  1 83 -3.85 ? +13:20:29  0 70 -57.62 ? +13:20:29  1 80 -5.76 ↘ +13:20:39  0 75 +7.79 ↗ +13:20:49  0 77 +5.36 → +Average:  0 80.50 -11.19 + +13:37:29  LINUX RESTART (9 CPU) + \ No newline at end of file diff --git a/tests/expected2.sar32-A b/tests/expected2.sar32-A index f824a29..aefd09d 100644 --- a/tests/expected2.sar32-A +++ b/tests/expected2.sar32-A @@ -456,6 +456,14 @@ Average: 5 3493.55 Average: 6 3492.22 Average: 7 3497.56 +13:20:09 BAT %cap cap/min status +13:20:19 0 100 +0.00 ↑ +13:20:19 1 83 -3.85 ? +13:20:29 0 70 -57.62 ? +13:20:29 1 80 -5.76 ↘ +Average: 0 85.00 -28.84 +Average: 1 81.50 -4.81 + 13:20:09 BUS idvendor idprod maxpower manufact product 13:20:29 1 3f0 862 196 HP HP Wireless Keyboard Mouse Kit 13:20:29 3 174c 55aa 0 ASMT ASM1153 diff --git a/tests/expected3.sar-all b/tests/expected3.sar-all index 9644fc4..ce95fac 100644 --- a/tests/expected3.sar-all +++ b/tests/expected3.sar-all @@ -424,6 +424,15 @@ Average: 3 0.00 0.00 0.00 0.00 0.00 0 13:20:49 3 3566.22 Average: 3 3566.22 +13:20:09 BAT %cap cap/min status +13:20:19 0 100 +0.00 ↑ +13:20:19 1 83 -3.85 ? +13:20:29 0 70 -57.62 ? +13:20:29 1 80 -5.76 ↘ +13:20:39 0 75 +7.79 ↗ +13:20:49 0 77 +5.36 → +Average: 0 80.50 -11.19 + 13:20:09 BUS idvendor idprod maxpower manufact product 13:20:29 1 3f0 862 196 HP HP Wireless Keyboard Mouse Kit 13:20:29 3 174c 55aa 0 ASMT ASM1153 diff --git a/tests/root1/sys/class/power_supply/BAT0/capacity b/tests/root1/sys/class/power_supply/BAT0/capacity new file mode 100644 index 0000000..29d6383 --- /dev/null +++ b/tests/root1/sys/class/power_supply/BAT0/capacity @@ -0,0 +1 @@ +100 diff --git a/tests/root1/sys/class/power_supply/BAT0/status b/tests/root1/sys/class/power_supply/BAT0/status new file mode 100644 index 0000000..f1a797a --- /dev/null +++ b/tests/root1/sys/class/power_supply/BAT0/status @@ -0,0 +1 @@ +Full diff --git a/tests/root1/sys/class/power_supply/BAT1/capacity b/tests/root1/sys/class/power_supply/BAT1/capacity new file mode 100644 index 0000000..a862eb8 --- /dev/null +++ b/tests/root1/sys/class/power_supply/BAT1/capacity @@ -0,0 +1 @@ +85 diff --git a/tests/root1/sys/class/power_supply/BAT1/status b/tests/root1/sys/class/power_supply/BAT1/status new file mode 100644 index 0000000..7acbb0e --- /dev/null +++ b/tests/root1/sys/class/power_supply/BAT1/status @@ -0,0 +1 @@ +Not charging diff --git a/tests/root1/sys/class/power_supply/_list b/tests/root1/sys/class/power_supply/_list new file mode 100644 index 0000000..cacd3be --- /dev/null +++ b/tests/root1/sys/class/power_supply/_list @@ -0,0 +1,4 @@ +. +.. +BAT0 +BAT1 diff --git a/tests/root2/root1 b/tests/root2/root1 new file mode 120000 index 0000000..bc96be9 --- /dev/null +++ b/tests/root2/root1 @@ -0,0 +1 @@ +root1 \ No newline at end of file diff --git a/tests/root2/root2 b/tests/root2/root2 new file mode 120000 index 0000000..c65031a --- /dev/null +++ b/tests/root2/root2 @@ -0,0 +1 @@ +root2 \ No newline at end of file diff --git a/tests/root2/sys/class/power_supply/BAT0/capacity b/tests/root2/sys/class/power_supply/BAT0/capacity new file mode 100644 index 0000000..29d6383 --- /dev/null +++ b/tests/root2/sys/class/power_supply/BAT0/capacity @@ -0,0 +1 @@ +100 diff --git a/tests/root2/sys/class/power_supply/BAT0/status b/tests/root2/sys/class/power_supply/BAT0/status new file mode 100644 index 0000000..f1a797a --- /dev/null +++ b/tests/root2/sys/class/power_supply/BAT0/status @@ -0,0 +1 @@ +Full diff --git a/tests/root2/sys/class/power_supply/BAT1/capacity b/tests/root2/sys/class/power_supply/BAT1/capacity new file mode 100644 index 0000000..76a8b2b --- /dev/null +++ b/tests/root2/sys/class/power_supply/BAT1/capacity @@ -0,0 +1 @@ +83 diff --git a/tests/root2/sys/class/power_supply/BAT1/status b/tests/root2/sys/class/power_supply/BAT1/status new file mode 100644 index 0000000..59fd4d6 --- /dev/null +++ b/tests/root2/sys/class/power_supply/BAT1/status @@ -0,0 +1 @@ +Error diff --git a/tests/root2/sys/class/power_supply/_list b/tests/root2/sys/class/power_supply/_list new file mode 100644 index 0000000..cacd3be --- /dev/null +++ b/tests/root2/sys/class/power_supply/_list @@ -0,0 +1,4 @@ +. +.. +BAT0 +BAT1 diff --git a/tests/root3/sys/class/power_supply/BAT0/capacity b/tests/root3/sys/class/power_supply/BAT0/capacity new file mode 100644 index 0000000..2bbd69c --- /dev/null +++ b/tests/root3/sys/class/power_supply/BAT0/capacity @@ -0,0 +1 @@ +70 diff --git a/tests/root3/sys/class/power_supply/BAT0/status b/tests/root3/sys/class/power_supply/BAT0/status new file mode 100644 index 0000000..1ee1f7b --- /dev/null +++ b/tests/root3/sys/class/power_supply/BAT0/status @@ -0,0 +1 @@ +Unknown diff --git a/tests/root3/sys/class/power_supply/BAT1/capacity b/tests/root3/sys/class/power_supply/BAT1/capacity new file mode 100644 index 0000000..d15a2cc --- /dev/null +++ b/tests/root3/sys/class/power_supply/BAT1/capacity @@ -0,0 +1 @@ +80 diff --git a/tests/root3/sys/class/power_supply/BAT1/status b/tests/root3/sys/class/power_supply/BAT1/status new file mode 100644 index 0000000..4674475 --- /dev/null +++ b/tests/root3/sys/class/power_supply/BAT1/status @@ -0,0 +1 @@ +Discharging diff --git a/tests/root3/sys/class/power_supply/_list b/tests/root3/sys/class/power_supply/_list new file mode 100644 index 0000000..cacd3be --- /dev/null +++ b/tests/root3/sys/class/power_supply/_list @@ -0,0 +1,4 @@ +. +.. +BAT0 +BAT1 diff --git a/tests/root4/sys/class/power_supply/BAT0/capacity b/tests/root4/sys/class/power_supply/BAT0/capacity new file mode 100644 index 0000000..78eb67c --- /dev/null +++ b/tests/root4/sys/class/power_supply/BAT0/capacity @@ -0,0 +1 @@ +75 diff --git a/tests/root4/sys/class/power_supply/BAT0/status b/tests/root4/sys/class/power_supply/BAT0/status new file mode 100644 index 0000000..a71a143 --- /dev/null +++ b/tests/root4/sys/class/power_supply/BAT0/status @@ -0,0 +1 @@ +Charging diff --git a/tests/root4/sys/class/power_supply/_list b/tests/root4/sys/class/power_supply/_list new file mode 100644 index 0000000..ddf1cf1 --- /dev/null +++ b/tests/root4/sys/class/power_supply/_list @@ -0,0 +1,3 @@ +. +.. +BAT0 diff --git a/tests/root5/sys/class/power_supply/BAT0/capacity b/tests/root5/sys/class/power_supply/BAT0/capacity new file mode 100644 index 0000000..987e7ca --- /dev/null +++ b/tests/root5/sys/class/power_supply/BAT0/capacity @@ -0,0 +1 @@ +77 diff --git a/tests/root5/sys/class/power_supply/BAT0/status b/tests/root5/sys/class/power_supply/BAT0/status new file mode 100644 index 0000000..7acbb0e --- /dev/null +++ b/tests/root5/sys/class/power_supply/BAT0/status @@ -0,0 +1 @@ +Not charging diff --git a/tests/root5/sys/class/power_supply/_list b/tests/root5/sys/class/power_supply/_list new file mode 100644 index 0000000..ddf1cf1 --- /dev/null +++ b/tests/root5/sys/class/power_supply/_list @@ -0,0 +1,3 @@ +. +.. +BAT0 -- 2.40.0