From: Wolfgang Stöggl Date: Wed, 6 Mar 2019 17:29:36 +0000 (+0100) Subject: Allow nan and -nan in test pdp-calc1 X-Git-Tag: v1.7.2~32 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5124984a89fc31252e0a81f6a62a8ee8b7c4e952;p=thirdparty%2Frrdtool-1.x.git Allow nan and -nan in test pdp-calc1 --- diff --git a/tests/pdp-calc1 b/tests/pdp-calc1 index e02c7e9e..1cc4fa2a 100755 --- a/tests/pdp-calc1 +++ b/tests/pdp-calc1 @@ -61,9 +61,9 @@ report "update all" is_cached && exit 0 -$RRDTOOL fetch ${BUILD}.rrd AVERAGE -r 60 -s 1548500640 -e 1548502500 | $DIFF --ignore-space-change - $BASEDIR/pdp-calc1-1-avg-60.output +$RRDTOOL fetch ${BUILD}.rrd AVERAGE -r 60 -s 1548500640 -e 1548502500 | sed 's/-nan/nan/g' | $DIFF --ignore-space-change - $BASEDIR/pdp-calc1-1-avg-60.output report "fetch avg 60" -$RRDTOOL fetch ${BUILD}.rrd AVERAGE -r 300 -s 1548500640 -e 1548502500 | $DIFF --ignore-space-change - $BASEDIR/pdp-calc1-1-avg-300.output +$RRDTOOL fetch ${BUILD}.rrd AVERAGE -r 300 -s 1548500640 -e 1548502500 | sed 's/-nan/nan/g' | $DIFF --ignore-space-change - $BASEDIR/pdp-calc1-1-avg-300.output report "fetch avg 300" -$RRDTOOL fetch ${BUILD}.rrd MAX -r 300 -s 1548500640 -e 1548502500 | $DIFF --ignore-space-change - $BASEDIR/pdp-calc1-1-max-300.output +$RRDTOOL fetch ${BUILD}.rrd MAX -r 300 -s 1548500640 -e 1548502500 | sed 's/-nan/nan/g' | $DIFF --ignore-space-change - $BASEDIR/pdp-calc1-1-max-300.output report "fetch max 300" diff --git a/tests/pdp-calc1-1-avg-300.output b/tests/pdp-calc1-1-avg-300.output index 0e8ff2bd..783b6b83 100644 --- a/tests/pdp-calc1-1-avg-300.output +++ b/tests/pdp-calc1-1-avg-300.output @@ -1,10 +1,10 @@ Gauge Counter Absolute -1548500700: -nan -nan -nan +1548500700: nan nan nan 1548501000: 9.0000000000e-01 9.0000000000e-01 9.0000000000e-01 -1548501300: 1.2500000000e+00 -nan 1.1785714286e+00 +1548501300: 1.2500000000e+00 nan 1.1785714286e+00 1548501600: 1.0000000000e+00 1.0000000000e+00 1.0000000000e+00 1548501900: 1.9666666667e+00 1.9666666667e+00 1.9666666667e+00 1548502200: 0.0000000000e+00 0.0000000000e+00 0.0000000000e+00 1548502500: 4.2333333333e+00 4.2333333333e+00 4.2333333333e+00 -1548502800: -nan -nan -nan +1548502800: nan nan nan diff --git a/tests/pdp-calc1-1-avg-60.output b/tests/pdp-calc1-1-avg-60.output index f231eb33..2df89d4e 100644 --- a/tests/pdp-calc1-1-avg-60.output +++ b/tests/pdp-calc1-1-avg-60.output @@ -1,16 +1,16 @@ Gauge Counter Absolute -1548500700: -nan -nan -nan +1548500700: nan nan nan 1548500760: 1.0000000000e+00 1.0000000000e+00 1.0000000000e+00 1548500820: 5.0000000000e-01 5.0000000000e-01 5.0000000000e-01 1548500880: 1.0000000000e+00 1.0000000000e+00 1.0000000000e+00 1548500940: 1.0000000000e+00 1.0000000000e+00 1.0000000000e+00 1548501000: 1.0000000000e+00 1.0000000000e+00 1.0000000000e+00 1548501060: 2.0000000000e+00 1.7142857143e+00 1.7142857143e+00 -1548501120: -nan -nan -nan -1548501180: 1.0000000000e+00 -nan 1.0000000000e+00 -1548501240: 1.0000000000e+00 -nan 1.0000000000e+00 -1548501300: 1.0000000000e+00 -nan 1.0000000000e+00 +1548501120: nan nan nan +1548501180: 1.0000000000e+00 nan 1.0000000000e+00 +1548501240: 1.0000000000e+00 nan 1.0000000000e+00 +1548501300: 1.0000000000e+00 nan 1.0000000000e+00 1548501360: 1.0000000000e+00 1.0000000000e+00 1.0000000000e+00 1548501420: 1.0000000000e+00 1.0000000000e+00 1.0000000000e+00 1548501480: 1.0000000000e+00 1.0000000000e+00 1.0000000000e+00 @@ -31,4 +31,4 @@ 1548502380: 4.0000000000e+00 4.0000000000e+00 4.0000000000e+00 1548502440: 4.5000000000e+00 4.5000000000e+00 4.5000000000e+00 1548502500: 5.0000000000e+00 5.0000000000e+00 5.0000000000e+00 -1548502560: -nan -nan -nan +1548502560: nan nan nan diff --git a/tests/pdp-calc1-1-max-300.output b/tests/pdp-calc1-1-max-300.output index 523d0896..1ff06f66 100644 --- a/tests/pdp-calc1-1-max-300.output +++ b/tests/pdp-calc1-1-max-300.output @@ -1,10 +1,10 @@ Gauge Counter Absolute -1548500700: -nan -nan -nan +1548500700: nan nan nan 1548501000: 1.0000000000e+00 1.0000000000e+00 1.0000000000e+00 -1548501300: 2.0000000000e+00 -nan 1.7142857143e+00 +1548501300: 2.0000000000e+00 nan 1.7142857143e+00 1548501600: 1.0000000000e+00 1.0000000000e+00 1.0000000000e+00 1548501900: 6.8333333333e+00 6.8333333333e+00 6.8333333333e+00 1548502200: 0.0000000000e+00 0.0000000000e+00 0.0000000000e+00 1548502500: 5.0000000000e+00 5.0000000000e+00 5.0000000000e+00 -1548502800: -nan -nan -nan +1548502800: nan nan nan