From: Sebastien GODARD Date: Fri, 28 Jun 2019 09:33:14 +0000 (+0200) Subject: simtest: sar: Add non regression tests for sensors statistics X-Git-Tag: v12.1.6~20 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5096047fde5276c8f3d0556656687958cb94c8c0;p=sysstat simtest: sar: Add non regression tests for sensors statistics Sensors statistics cannot be read in Travis CI environment because the requested library is not available. But we can at least display sensors statistics from a binary datafile already containing them. Signed-off-by: Sebastien GODARD --- diff --git a/tests/01500 b/tests/01500 new file mode 100644 index 0000000..1f03689 --- /dev/null +++ b/tests/01500 @@ -0,0 +1 @@ +LC_ALL=C TZ=GMT ./sadf -d tests/data-11.6.5.tmp -- -m FAN,IN,TEMP > tests/out.data-11.6.5-sadf-d.tmp diff --git a/tests/01505 b/tests/01505 new file mode 100644 index 0000000..cd91b6c --- /dev/null +++ b/tests/01505 @@ -0,0 +1 @@ +diff -u tests/out.data-11.6.5-sadf-d.tmp tests/expected.data-11.6.5-sadf-d diff --git a/tests/01510 b/tests/01510 new file mode 100644 index 0000000..193451c --- /dev/null +++ b/tests/01510 @@ -0,0 +1 @@ +LC_ALL=C TZ=GMT ./sadf -p tests/data-11.6.5.tmp -- -m FAN,IN,TEMP > tests/out.data-11.6.5-sadf-p.tmp diff --git a/tests/01515 b/tests/01515 new file mode 100644 index 0000000..e2c73b2 --- /dev/null +++ b/tests/01515 @@ -0,0 +1 @@ +diff -u tests/out.data-11.6.5-sadf-p.tmp tests/expected.data-11.6.5-sadf-p diff --git a/tests/01520 b/tests/01520 new file mode 100644 index 0000000..38894c6 --- /dev/null +++ b/tests/01520 @@ -0,0 +1 @@ +LC_ALL=C TZ=GMT ./sadf -r tests/data-11.6.5.tmp -- -m FAN,IN,TEMP > tests/out.data-11.6.5-sadf-r.tmp diff --git a/tests/01525 b/tests/01525 new file mode 100644 index 0000000..48ef2d7 --- /dev/null +++ b/tests/01525 @@ -0,0 +1 @@ +diff -u tests/out.data-11.6.5-sadf-r.tmp tests/expected.data-11.6.5-sadf-r diff --git a/tests/01530 b/tests/01530 new file mode 100644 index 0000000..7a2c686 --- /dev/null +++ b/tests/01530 @@ -0,0 +1 @@ +LC_ALL=C TZ=GMT ./sadf -g tests/data-11.6.5.tmp -- -m FAN,IN,TEMP > tests/out.data-11.6.5-sadf-g.tmp diff --git a/tests/01535 b/tests/01535 new file mode 100644 index 0000000..6abafc2 --- /dev/null +++ b/tests/01535 @@ -0,0 +1 @@ +diff -u tests/out.data-11.6.5-sadf-g.tmp tests/expected.data-11.6.5-sadf-g diff --git a/tests/01540 b/tests/01540 new file mode 100644 index 0000000..b6d7d77 --- /dev/null +++ b/tests/01540 @@ -0,0 +1 @@ +LC_ALL=C TZ=GMT ./sadf -j tests/data-11.6.5.tmp -- -m FAN,IN,TEMP > tests/out.data-11.6.5-sadf-j.tmp diff --git a/tests/01545 b/tests/01545 new file mode 100644 index 0000000..10f026d --- /dev/null +++ b/tests/01545 @@ -0,0 +1 @@ +diff -u tests/out.data-11.6.5-sadf-j.tmp tests/expected.data-11.6.5-sadf-j diff --git a/tests/01547 b/tests/01547 new file mode 100644 index 0000000..ea0b1b7 --- /dev/null +++ b/tests/01547 @@ -0,0 +1,4 @@ +. tests/variables +if [ ! -z "$VER_JSON" ]; then + cat tests/out.data-11.6.5-sadf-j.tmp | $VER_JSON >/dev/null; +fi diff --git a/tests/01550 b/tests/01550 new file mode 100644 index 0000000..771b2d8 --- /dev/null +++ b/tests/01550 @@ -0,0 +1 @@ +LC_ALL=C TZ=GMT ./sadf -x tests/data-11.6.5.tmp -- -m FAN,IN,TEMP > tests/out.data-11.6.5-sadf-x.tmp diff --git a/tests/01555 b/tests/01555 new file mode 100644 index 0000000..2442fad --- /dev/null +++ b/tests/01555 @@ -0,0 +1 @@ +diff -u tests/out.data-11.6.5-sadf-x.tmp tests/expected.data-11.6.5-sadf-x diff --git a/tests/01557 b/tests/01557 new file mode 100644 index 0000000..11a9b36 --- /dev/null +++ b/tests/01557 @@ -0,0 +1,4 @@ +. tests/variables +if [ ! -z "$VER_XML" ]; then + cat tests/out.data-11.6.5-sadf-x.tmp | $VER_XML --schema xml/sysstat.xsd - >/dev/null; +fi diff --git a/tests/01559 b/tests/01559 new file mode 100644 index 0000000..8e1fae2 --- /dev/null +++ b/tests/01559 @@ -0,0 +1,4 @@ +. tests/variables +if [ ! -z "$VER_XML" ]; then + cat tests/out.data-11.6.5-sadf-x.tmp | $VER_XML --dtdvalid xml/sysstat-*.dtd - >/dev/null; +fi diff --git a/tests/TLIST b/tests/TLIST index 050b1d6..9bf44d5 100644 --- a/tests/TLIST +++ b/tests/TLIST @@ -191,6 +191,23 @@ 01430 LC_ALL=C ./sar -o foo 2>&1 | grep "Usage:" >/dev/null 01440 LC_ALL=C TZ=GMT ./sar --unix_time=123456789 2>&1 | grep "Please check" >/dev/null +===== Specific tests for sensors statistics (basic sensor output already tested using data-11.6.5 conversion) +01500 LC_ALL=C TZ=GMT ./sadf -d tests/data-11.6.5.tmp -- -m FAN,IN,TEMP > tests/out.data-11.6.5-sadf-d.tmp +01505 diff -u tests/out.data-11.6.5-sadf-d.tmp tests/expected.data-11.6.5-sadf-d +01510 LC_ALL=C TZ=GMT ./sadf -p tests/data-11.6.5.tmp -- -m FAN,IN,TEMP > tests/out.data-11.6.5-sadf-p.tmp +01515 diff -u tests/out.data-11.6.5-sadf-p.tmp tests/expected.data-11.6.5-sadf-p +01520 LC_ALL=C TZ=GMT ./sadf -r tests/data-11.6.5.tmp -- -m FAN,IN,TEMP > tests/out.data-11.6.5-sadf-r.tmp +01525 diff -u tests/out.data-11.6.5-sadf-r.tmp tests/expected.data-11.6.5-sadf-r +01530 LC_ALL=C TZ=GMT ./sadf -g tests/data-11.6.5.tmp -- -m FAN,IN,TEMP > tests/out.data-11.6.5-sadf-g.tmp +01535 diff -u tests/out.data-11.6.5-sadf-g.tmp tests/expected.data-11.6.5-sadf-g +01540 LC_ALL=C TZ=GMT ./sadf -j tests/data-11.6.5.tmp -- -m FAN,IN,TEMP > tests/out.data-11.6.5-sadf-j.tmp +01545 diff -u tests/out.data-11.6.5-sadf-j.tmp tests/expected.data-11.6.5-sadf-j +01547 cat tests/out.data-11.6.5-sadf-j.tmp | $VER_JSON >/dev/null; +01550 LC_ALL=C TZ=GMT ./sadf -x tests/data-11.6.5.tmp -- -m FAN,IN,TEMP > tests/out.data-11.6.5-sadf-x.tmp +01555 diff -u tests/out.data-11.6.5-sadf-x.tmp tests/expected.data-11.6.5-sadf-x +01557 cat tests/out.data-11.6.5-sadf-x.tmp | $VER_XML --schema xml/sysstat.xsd - >/dev/null; +01559 cat tests/out.data-11.6.5-sadf-x.tmp | $VER_XML --dtdvalid xml/sysstat-*.dtd - >/dev/null; + ===== iostat tests (basic output) 02010 LC_ALL=C ./iostat 2 3 > tests/out.iostat.tmp 02015 diff -u tests/out.iostat.tmp tests/expected.iostat diff --git a/tests/expected.data-11.6.5-sadf-d b/tests/expected.data-11.6.5-sadf-d new file mode 100644 index 0000000..ccc8a6f --- /dev/null +++ b/tests/expected.data-11.6.5-sadf-d @@ -0,0 +1,21 @@ +linux.home;-1;2018-08-29 09:33:38 UTC;LINUX-RESTART (8 CPU) +# hostname;interval;timestamp;FAN;DEVICE;rpm;drpm +linux.home;46;2018-08-29 09:34:34 UTC;1;f71858fg-isa-0200;1283.00;1283.00 +linux.home;46;2018-08-29 09:34:34 UTC;2;f71858fg-isa-0200;1347.00;1347.00 +linux.home;46;2018-08-29 09:34:34 UTC;3;f71858fg-isa-0200;0.00;0.00 +linux.home;46;2018-08-29 09:34:34 UTC;4;nouveau-pci-0100;1650.00;1650.00 +# hostname;interval;timestamp;TEMP;DEVICE;degC;%temp +linux.home;46;2018-08-29 09:34:34 UTC;1;f71858fg-isa-0200;34.00;48.57 +linux.home;46;2018-08-29 09:34:34 UTC;2;f71858fg-isa-0200;30.50;30.50 +linux.home;46;2018-08-29 09:34:34 UTC;3;f71858fg-isa-0200;29.12;29.12 +linux.home;46;2018-08-29 09:34:34 UTC;4;nouveau-pci-0100;36.00;37.89 +linux.home;46;2018-08-29 09:34:34 UTC;5;coretemp-isa-0000;34.00;42.50 +linux.home;46;2018-08-29 09:34:34 UTC;6;coretemp-isa-0000;34.00;42.50 +linux.home;46;2018-08-29 09:34:34 UTC;7;coretemp-isa-0000;32.00;40.00 +linux.home;46;2018-08-29 09:34:34 UTC;8;coretemp-isa-0000;31.00;38.75 +linux.home;46;2018-08-29 09:34:34 UTC;9;coretemp-isa-0000;33.00;41.25 +# hostname;interval;timestamp;IN;DEVICE;inV;%in +linux.home;46;2018-08-29 09:34:34 UTC;0;f71858fg-isa-0200;3.33;0.00 +linux.home;46;2018-08-29 09:34:34 UTC;1;f71858fg-isa-0200;3.34;0.00 +linux.home;46;2018-08-29 09:34:34 UTC;2;f71858fg-isa-0200;3.31;0.00 +linux.home;46;2018-08-29 09:34:34 UTC;3;nouveau-pci-0100;0.95;38.46 diff --git a/tests/expected.data-11.6.5-sadf-g b/tests/expected.data-11.6.5-sadf-g new file mode 100644 index 0000000..7539d8b --- /dev/null +++ b/tests/expected.data-11.6.5-sadf-g @@ -0,0 +1,1314 @@ + + + +Linux 4.17.18-200.fc28.x86_64 (linux.home) 08/29/18 _x86_64_ (8 CPU) + + + +Fans speed [1: f71858fg-isa-0200] +(Min, Max values) + + +rpm (1283, 1283) + +0. + +400. + +800. + +1200. + +09:33:48 + +09:33:52 + +09:33:56 + +09:34:00 + +09:34:04 + +09:34:08 + +09:34:12 + +09:34:16 + +09:34:20 + +09:34:24 + +09:34:28 + +09:34:32 +UTC + + + + + +Fans speed [2: f71858fg-isa-0200] +(Min, Max values) + + +rpm (1347, 1347) + +0. + +400. + +800. + +1200. + +09:33:48 + +09:33:52 + +09:33:56 + +09:34:00 + +09:34:04 + +09:34:08 + +09:34:12 + +09:34:16 + +09:34:20 + +09:34:24 + +09:34:28 + +09:34:32 +UTC + + + + + +Fans speed [3: f71858fg-isa-0200] +(Min, Max values) + + +rpm (0, 0) + +0.00. + +0.33. + +0.67. + +1.00. + +09:33:48 + +09:33:52 + +09:33:56 + +09:34:00 + +09:34:04 + +09:34:08 + +09:34:12 + +09:34:16 + +09:34:20 + +09:34:24 + +09:34:28 + +09:34:32 +UTC + + + + + +Fans speed [4: nouveau-pci-0100] +(Min, Max values) + + +rpm (1650, 1650) + +0. + +500. + +1000. + +1500. + +09:33:48 + +09:33:52 + +09:33:56 + +09:34:00 + +09:34:04 + +09:34:08 + +09:34:12 + +09:34:16 + +09:34:20 + +09:34:24 + +09:34:28 + +09:34:32 +UTC + + + + + +Devices temperature (1) [1: f71858fg-isa-0200] +(Min, Max values) + + +degC (34, 34) + +0. + +10. + +20. + +30. + +09:33:48 + +09:33:52 + +09:33:56 + +09:34:00 + +09:34:04 + +09:34:08 + +09:34:12 + +09:34:16 + +09:34:20 + +09:34:24 + +09:34:28 + +09:34:32 +UTC + + + +Devices temperature (2) [1: f71858fg-isa-0200] +(Min, Max values) + + +%temp (48.57, 48.57) + +0. + +25. + +50. + +75. + +100. + +09:33:48 + +09:33:52 + +09:33:56 + +09:34:00 + +09:34:04 + +09:34:08 + +09:34:12 + +09:34:16 + +09:34:20 + +09:34:24 + +09:34:28 + +09:34:32 +UTC + + + + + + + +Devices temperature (1) [2: f71858fg-isa-0200] +(Min, Max values) + + +degC (30, 30) + +0. + +10. + +20. + +30. + +09:33:48 + +09:33:52 + +09:33:56 + +09:34:00 + +09:34:04 + +09:34:08 + +09:34:12 + +09:34:16 + +09:34:20 + +09:34:24 + +09:34:28 + +09:34:32 +UTC + + + +Devices temperature (2) [2: f71858fg-isa-0200] +(Min, Max values) + + +%temp (30.50, 30.50) + +0. + +25. + +50. + +75. + +100. + +09:33:48 + +09:33:52 + +09:33:56 + +09:34:00 + +09:34:04 + +09:34:08 + +09:34:12 + +09:34:16 + +09:34:20 + +09:34:24 + +09:34:28 + +09:34:32 +UTC + + + + + + + +Devices temperature (1) [3: f71858fg-isa-0200] +(Min, Max values) + + +degC (29, 29) + +0. + +9. + +18. + +27. + +09:33:48 + +09:33:52 + +09:33:56 + +09:34:00 + +09:34:04 + +09:34:08 + +09:34:12 + +09:34:16 + +09:34:20 + +09:34:24 + +09:34:28 + +09:34:32 +UTC + + + +Devices temperature (2) [3: f71858fg-isa-0200] +(Min, Max values) + + +%temp (29.12, 29.12) + +0. + +25. + +50. + +75. + +100. + +09:33:48 + +09:33:52 + +09:33:56 + +09:34:00 + +09:34:04 + +09:34:08 + +09:34:12 + +09:34:16 + +09:34:20 + +09:34:24 + +09:34:28 + +09:34:32 +UTC + + + + + + + +Devices temperature (1) [4: nouveau-pci-0100] +(Min, Max values) + + +degC (36, 36) + +0. + +10. + +20. + +30. + +09:33:48 + +09:33:52 + +09:33:56 + +09:34:00 + +09:34:04 + +09:34:08 + +09:34:12 + +09:34:16 + +09:34:20 + +09:34:24 + +09:34:28 + +09:34:32 +UTC + + + +Devices temperature (2) [4: nouveau-pci-0100] +(Min, Max values) + + +%temp (37.89, 37.89) + +0. + +25. + +50. + +75. + +100. + +09:33:48 + +09:33:52 + +09:33:56 + +09:34:00 + +09:34:04 + +09:34:08 + +09:34:12 + +09:34:16 + +09:34:20 + +09:34:24 + +09:34:28 + +09:34:32 +UTC + + + + + + + +Devices temperature (1) [5: coretemp-isa-0000] +(Min, Max values) + + +degC (34, 34) + +0. + +10. + +20. + +30. + +09:33:48 + +09:33:52 + +09:33:56 + +09:34:00 + +09:34:04 + +09:34:08 + +09:34:12 + +09:34:16 + +09:34:20 + +09:34:24 + +09:34:28 + +09:34:32 +UTC + + + +Devices temperature (2) [5: coretemp-isa-0000] +(Min, Max values) + + +%temp (42.50, 42.50) + +0. + +25. + +50. + +75. + +100. + +09:33:48 + +09:33:52 + +09:33:56 + +09:34:00 + +09:34:04 + +09:34:08 + +09:34:12 + +09:34:16 + +09:34:20 + +09:34:24 + +09:34:28 + +09:34:32 +UTC + + + + + + + +Devices temperature (1) [6: coretemp-isa-0000] +(Min, Max values) + + +degC (34, 34) + +0. + +10. + +20. + +30. + +09:33:48 + +09:33:52 + +09:33:56 + +09:34:00 + +09:34:04 + +09:34:08 + +09:34:12 + +09:34:16 + +09:34:20 + +09:34:24 + +09:34:28 + +09:34:32 +UTC + + + +Devices temperature (2) [6: coretemp-isa-0000] +(Min, Max values) + + +%temp (42.50, 42.50) + +0. + +25. + +50. + +75. + +100. + +09:33:48 + +09:33:52 + +09:33:56 + +09:34:00 + +09:34:04 + +09:34:08 + +09:34:12 + +09:34:16 + +09:34:20 + +09:34:24 + +09:34:28 + +09:34:32 +UTC + + + + + + + +Devices temperature (1) [7: coretemp-isa-0000] +(Min, Max values) + + +degC (32, 32) + +0. + +10. + +20. + +30. + +09:33:48 + +09:33:52 + +09:33:56 + +09:34:00 + +09:34:04 + +09:34:08 + +09:34:12 + +09:34:16 + +09:34:20 + +09:34:24 + +09:34:28 + +09:34:32 +UTC + + + +Devices temperature (2) [7: coretemp-isa-0000] +(Min, Max values) + + +%temp (40.00, 40.00) + +0. + +25. + +50. + +75. + +100. + +09:33:48 + +09:33:52 + +09:33:56 + +09:34:00 + +09:34:04 + +09:34:08 + +09:34:12 + +09:34:16 + +09:34:20 + +09:34:24 + +09:34:28 + +09:34:32 +UTC + + + + + + + +Devices temperature (1) [8: coretemp-isa-0000] +(Min, Max values) + + +degC (31, 31) + +0. + +10. + +20. + +30. + +09:33:48 + +09:33:52 + +09:33:56 + +09:34:00 + +09:34:04 + +09:34:08 + +09:34:12 + +09:34:16 + +09:34:20 + +09:34:24 + +09:34:28 + +09:34:32 +UTC + + + +Devices temperature (2) [8: coretemp-isa-0000] +(Min, Max values) + + +%temp (38.75, 38.75) + +0. + +25. + +50. + +75. + +100. + +09:33:48 + +09:33:52 + +09:33:56 + +09:34:00 + +09:34:04 + +09:34:08 + +09:34:12 + +09:34:16 + +09:34:20 + +09:34:24 + +09:34:28 + +09:34:32 +UTC + + + + + + + +Devices temperature (1) [9: coretemp-isa-0000] +(Min, Max values) + + +degC (33, 33) + +0. + +10. + +20. + +30. + +09:33:48 + +09:33:52 + +09:33:56 + +09:34:00 + +09:34:04 + +09:34:08 + +09:34:12 + +09:34:16 + +09:34:20 + +09:34:24 + +09:34:28 + +09:34:32 +UTC + + + +Devices temperature (2) [9: coretemp-isa-0000] +(Min, Max values) + + +%temp (41.25, 41.25) + +0. + +25. + +50. + +75. + +100. + +09:33:48 + +09:33:52 + +09:33:56 + +09:34:00 + +09:34:04 + +09:34:08 + +09:34:12 + +09:34:16 + +09:34:20 + +09:34:24 + +09:34:28 + +09:34:32 +UTC + + + + + + + +Voltage inputs statistics (1) [1: f71858fg-isa-0200] +(Min, Max values) + + +inV (3.33, 3.33) + +0. + +1. + +2. + +3. + +09:33:48 + +09:33:52 + +09:33:56 + +09:34:00 + +09:34:04 + +09:34:08 + +09:34:12 + +09:34:16 + +09:34:20 + +09:34:24 + +09:34:28 + +09:34:32 +UTC + + + +Voltage inputs statistics (2) [1: f71858fg-isa-0200] +(Min, Max values) + + +%in (0.00, 0.00) + +0. + +25. + +50. + +75. + +100. + +09:33:48 + +09:33:52 + +09:33:56 + +09:34:00 + +09:34:04 + +09:34:08 + +09:34:12 + +09:34:16 + +09:34:20 + +09:34:24 + +09:34:28 + +09:34:32 +UTC + + + + +Voltage inputs statistics (1) [2: f71858fg-isa-0200] +(Min, Max values) + + +inV (3.34, 3.34) + +0. + +1. + +2. + +3. + +09:33:48 + +09:33:52 + +09:33:56 + +09:34:00 + +09:34:04 + +09:34:08 + +09:34:12 + +09:34:16 + +09:34:20 + +09:34:24 + +09:34:28 + +09:34:32 +UTC + + + +Voltage inputs statistics (2) [2: f71858fg-isa-0200] +(Min, Max values) + + +%in (0.00, 0.00) + +0. + +25. + +50. + +75. + +100. + +09:33:48 + +09:33:52 + +09:33:56 + +09:34:00 + +09:34:04 + +09:34:08 + +09:34:12 + +09:34:16 + +09:34:20 + +09:34:24 + +09:34:28 + +09:34:32 +UTC + + + + +Voltage inputs statistics (1) [3: f71858fg-isa-0200] +(Min, Max values) + + +inV (3.31, 3.31) + +0. + +1. + +2. + +3. + +09:33:48 + +09:33:52 + +09:33:56 + +09:34:00 + +09:34:04 + +09:34:08 + +09:34:12 + +09:34:16 + +09:34:20 + +09:34:24 + +09:34:28 + +09:34:32 +UTC + + + +Voltage inputs statistics (2) [3: f71858fg-isa-0200] +(Min, Max values) + + +%in (0.00, 0.00) + +0. + +25. + +50. + +75. + +100. + +09:33:48 + +09:33:52 + +09:33:56 + +09:34:00 + +09:34:04 + +09:34:08 + +09:34:12 + +09:34:16 + +09:34:20 + +09:34:24 + +09:34:28 + +09:34:32 +UTC + + + + +Voltage inputs statistics (1) [4: nouveau-pci-0100] +(Min, Max values) + + +inV (0.95, 0.95) + +0.00. + +0.32. + +0.63. + +0.95. + +09:33:48 + +09:33:52 + +09:33:56 + +09:34:00 + +09:34:04 + +09:34:08 + +09:34:12 + +09:34:16 + +09:34:20 + +09:34:24 + +09:34:28 + +09:34:32 +UTC + + + +Voltage inputs statistics (2) [4: nouveau-pci-0100] +(Min, Max values) + + +%in (38.46, 38.46) + +0. + +25. + +50. + +75. + +100. + +09:33:48 + +09:33:52 + +09:33:56 + +09:34:00 + +09:34:04 + +09:34:08 + +09:34:12 + +09:34:16 + +09:34:20 + +09:34:24 + +09:34:28 + +09:34:32 +UTC + + + + + + + diff --git a/tests/expected.data-11.6.5-sadf-j b/tests/expected.data-11.6.5-sadf-j new file mode 100644 index 0000000..1fe2cb8 --- /dev/null +++ b/tests/expected.data-11.6.5-sadf-j @@ -0,0 +1,48 @@ +{"sysstat": { + "hosts": [ + { + "nodename": "linux.home", + "sysname": "Linux", + "release": "4.17.18-200.fc28.x86_64", + "machine": "x86_64", + "number-of-cpus": 8, + "file-date": "2018-08-29", + "file-utc-time": "09:33:38", + "statistics": [ + { + "timestamp": {"date": "2018-08-29", "time": "09:34:34", "utc": 1, "interval": 46}, + "power-management": { + "fan-speed": [ + {"number": 1, "rpm": 1283, "drpm": 1283, "device": "f71858fg-isa-0200"}, + {"number": 2, "rpm": 1347, "drpm": 1347, "device": "f71858fg-isa-0200"}, + {"number": 3, "rpm": 0, "drpm": 0, "device": "f71858fg-isa-0200"}, + {"number": 4, "rpm": 1650, "drpm": 1650, "device": "nouveau-pci-0100"} + ], + "temperature": [ + {"number": 1, "degC": 34.00, "percent-temp": 48.57, "device": "f71858fg-isa-0200"}, + {"number": 2, "degC": 30.50, "percent-temp": 30.50, "device": "f71858fg-isa-0200"}, + {"number": 3, "degC": 29.12, "percent-temp": 29.12, "device": "f71858fg-isa-0200"}, + {"number": 4, "degC": 36.00, "percent-temp": 37.89, "device": "nouveau-pci-0100"}, + {"number": 5, "degC": 34.00, "percent-temp": 42.50, "device": "coretemp-isa-0000"}, + {"number": 6, "degC": 34.00, "percent-temp": 42.50, "device": "coretemp-isa-0000"}, + {"number": 7, "degC": 32.00, "percent-temp": 40.00, "device": "coretemp-isa-0000"}, + {"number": 8, "degC": 31.00, "percent-temp": 38.75, "device": "coretemp-isa-0000"}, + {"number": 9, "degC": 33.00, "percent-temp": 41.25, "device": "coretemp-isa-0000"} + ], + "voltage-input": [ + {"number": 0, "inV": 3.33, "percent-in": 0.00, "device": "f71858fg-isa-0200"}, + {"number": 1, "inV": 3.34, "percent-in": 0.00, "device": "f71858fg-isa-0200"}, + {"number": 2, "inV": 3.31, "percent-in": 0.00, "device": "f71858fg-isa-0200"}, + {"number": 3, "inV": 0.95, "percent-in": 38.46, "device": "nouveau-pci-0100"} + ] + } + } + ], + "restarts": [ + { + "boot": {"date": "2018-08-29", "time": "09:33:38", "utc": 1, "cpu_count": 8} + } + ] + } + ] +}} diff --git a/tests/expected.data-11.6.5-sadf-p b/tests/expected.data-11.6.5-sadf-p new file mode 100644 index 0000000..694f008 --- /dev/null +++ b/tests/expected.data-11.6.5-sadf-p @@ -0,0 +1,52 @@ +linux.home -1 2018-08-29 09:33:38 UTC LINUX-RESTART (8 CPU) +linux.home 46 2018-08-29 09:34:34 UTC fan1 DEVICE f71858fg-isa-0200 +linux.home 46 2018-08-29 09:34:34 UTC fan1 rpm 1283.00 +linux.home 46 2018-08-29 09:34:34 UTC fan1 drpm 1283.00 +linux.home 46 2018-08-29 09:34:34 UTC fan2 DEVICE f71858fg-isa-0200 +linux.home 46 2018-08-29 09:34:34 UTC fan2 rpm 1347.00 +linux.home 46 2018-08-29 09:34:34 UTC fan2 drpm 1347.00 +linux.home 46 2018-08-29 09:34:34 UTC fan3 DEVICE f71858fg-isa-0200 +linux.home 46 2018-08-29 09:34:34 UTC fan3 rpm 0.00 +linux.home 46 2018-08-29 09:34:34 UTC fan3 drpm 0.00 +linux.home 46 2018-08-29 09:34:34 UTC fan4 DEVICE nouveau-pci-0100 +linux.home 46 2018-08-29 09:34:34 UTC fan4 rpm 1650.00 +linux.home 46 2018-08-29 09:34:34 UTC fan4 drpm 1650.00 +linux.home 46 2018-08-29 09:34:34 UTC temp1 DEVICE f71858fg-isa-0200 +linux.home 46 2018-08-29 09:34:34 UTC temp1 degC 34.00 +linux.home 46 2018-08-29 09:34:34 UTC temp1 %temp 48.57 +linux.home 46 2018-08-29 09:34:34 UTC temp2 DEVICE f71858fg-isa-0200 +linux.home 46 2018-08-29 09:34:34 UTC temp2 degC 30.50 +linux.home 46 2018-08-29 09:34:34 UTC temp2 %temp 30.50 +linux.home 46 2018-08-29 09:34:34 UTC temp3 DEVICE f71858fg-isa-0200 +linux.home 46 2018-08-29 09:34:34 UTC temp3 degC 29.12 +linux.home 46 2018-08-29 09:34:34 UTC temp3 %temp 29.12 +linux.home 46 2018-08-29 09:34:34 UTC temp4 DEVICE nouveau-pci-0100 +linux.home 46 2018-08-29 09:34:34 UTC temp4 degC 36.00 +linux.home 46 2018-08-29 09:34:34 UTC temp4 %temp 37.89 +linux.home 46 2018-08-29 09:34:34 UTC temp5 DEVICE coretemp-isa-0000 +linux.home 46 2018-08-29 09:34:34 UTC temp5 degC 34.00 +linux.home 46 2018-08-29 09:34:34 UTC temp5 %temp 42.50 +linux.home 46 2018-08-29 09:34:34 UTC temp6 DEVICE coretemp-isa-0000 +linux.home 46 2018-08-29 09:34:34 UTC temp6 degC 34.00 +linux.home 46 2018-08-29 09:34:34 UTC temp6 %temp 42.50 +linux.home 46 2018-08-29 09:34:34 UTC temp7 DEVICE coretemp-isa-0000 +linux.home 46 2018-08-29 09:34:34 UTC temp7 degC 32.00 +linux.home 46 2018-08-29 09:34:34 UTC temp7 %temp 40.00 +linux.home 46 2018-08-29 09:34:34 UTC temp8 DEVICE coretemp-isa-0000 +linux.home 46 2018-08-29 09:34:34 UTC temp8 degC 31.00 +linux.home 46 2018-08-29 09:34:34 UTC temp8 %temp 38.75 +linux.home 46 2018-08-29 09:34:34 UTC temp9 DEVICE coretemp-isa-0000 +linux.home 46 2018-08-29 09:34:34 UTC temp9 degC 33.00 +linux.home 46 2018-08-29 09:34:34 UTC temp9 %temp 41.25 +linux.home 46 2018-08-29 09:34:34 UTC in0 DEVICE f71858fg-isa-0200 +linux.home 46 2018-08-29 09:34:34 UTC in0 inV 3.33 +linux.home 46 2018-08-29 09:34:34 UTC in0 %in 0.00 +linux.home 46 2018-08-29 09:34:34 UTC in1 DEVICE f71858fg-isa-0200 +linux.home 46 2018-08-29 09:34:34 UTC in1 inV 3.34 +linux.home 46 2018-08-29 09:34:34 UTC in1 %in 0.00 +linux.home 46 2018-08-29 09:34:34 UTC in2 DEVICE f71858fg-isa-0200 +linux.home 46 2018-08-29 09:34:34 UTC in2 inV 3.31 +linux.home 46 2018-08-29 09:34:34 UTC in2 %in 0.00 +linux.home 46 2018-08-29 09:34:34 UTC in3 DEVICE nouveau-pci-0100 +linux.home 46 2018-08-29 09:34:34 UTC in3 inV 0.95 +linux.home 46 2018-08-29 09:34:34 UTC in3 %in 38.46 diff --git a/tests/expected.data-11.6.5-sadf-r b/tests/expected.data-11.6.5-sadf-r new file mode 100644 index 0000000..320e547 --- /dev/null +++ b/tests/expected.data-11.6.5-sadf-r @@ -0,0 +1,18 @@ +09:33:38 UTC; LINUX-RESTART (8 CPU) +09:34:34 UTC; FAN; 1; DEVICE; f71858fg-isa-0200; rpm; 1283.000000; rpm_min; 0.000000; +09:34:34 UTC; FAN; 2; DEVICE; f71858fg-isa-0200; rpm; 1347.000000; rpm_min; 0.000000; +09:34:34 UTC; FAN; 3; DEVICE; f71858fg-isa-0200; rpm; 0.000000; rpm_min; 0.000000; +09:34:34 UTC; FAN; 4; DEVICE; nouveau-pci-0100; rpm; 1650.000000; rpm_min; 0.000000; +09:34:34 UTC; TEMP; 1; DEVICE; f71858fg-isa-0200; degC; 34.000000; temp_min; 0.000000; temp_max; 70.000000; +09:34:34 UTC; TEMP; 2; DEVICE; f71858fg-isa-0200; degC; 30.500000; temp_min; 0.000000; temp_max; 100.000000; +09:34:34 UTC; TEMP; 3; DEVICE; f71858fg-isa-0200; degC; 29.125000; temp_min; 0.000000; temp_max; 100.000000; +09:34:34 UTC; TEMP; 4; DEVICE; nouveau-pci-0100; degC; 36.000000; temp_min; 0.000000; temp_max; 95.000000; +09:34:34 UTC; TEMP; 5; DEVICE; coretemp-isa-0000; degC; 34.000000; temp_min; 0.000000; temp_max; 80.000000; +09:34:34 UTC; TEMP; 6; DEVICE; coretemp-isa-0000; degC; 34.000000; temp_min; 0.000000; temp_max; 80.000000; +09:34:34 UTC; TEMP; 7; DEVICE; coretemp-isa-0000; degC; 32.000000; temp_min; 0.000000; temp_max; 80.000000; +09:34:34 UTC; TEMP; 8; DEVICE; coretemp-isa-0000; degC; 31.000000; temp_min; 0.000000; temp_max; 80.000000; +09:34:34 UTC; TEMP; 9; DEVICE; coretemp-isa-0000; degC; 33.000000; temp_min; 0.000000; temp_max; 80.000000; +09:34:34 UTC; IN; 0; DEVICE; f71858fg-isa-0200; inV; 3.328000; in_min; 0.000000; in_max; 0.000000; +09:34:34 UTC; IN; 1; DEVICE; f71858fg-isa-0200; inV; 3.344000; in_min; 0.000000; in_max; 0.000000; +09:34:34 UTC; IN; 2; DEVICE; f71858fg-isa-0200; inV; 3.312000; in_min; 0.000000; in_max; 0.000000; +09:34:34 UTC; IN; 3; DEVICE; nouveau-pci-0100; inV; 0.950000; in_min; 0.825000; in_max; 1.150000; diff --git a/tests/expected.data-11.6.5-sadf-x b/tests/expected.data-11.6.5-sadf-x new file mode 100644 index 0000000..8524d52 --- /dev/null +++ b/tests/expected.data-11.6.5-sadf-x @@ -0,0 +1,49 @@ + + + + 3.7 + + Linux + 4.17.18-200.fc28.x86_64 + x86_64 + 8 + 2018-08-29 + 09:33:38 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +