diff options
Diffstat (limited to 'tests/libs')
-rw-r--r-- | tests/libs/zbxdbcache/Makefile.am | 4 | ||||
-rw-r--r-- | tests/libs/zbxdbcache/dc_function_calculate_nextcheck.yaml | 32 | ||||
-rw-r--r-- | tests/libs/zbxtrends/zbx_trends_parse_range.yaml | 2 |
3 files changed, 18 insertions, 20 deletions
diff --git a/tests/libs/zbxdbcache/Makefile.am b/tests/libs/zbxdbcache/Makefile.am index 11cffaf9718..bf759fb3c1a 100644 --- a/tests/libs/zbxdbcache/Makefile.am +++ b/tests/libs/zbxdbcache/Makefile.am @@ -191,9 +191,9 @@ dc_expand_user_macros_in_calcitem_LDFLAGS = @SERVER_LDFLAGS@ dc_function_calculate_nextcheck_CFLAGS = \ -I@top_srcdir@/tests dc_function_calculate_nextcheck_SOURCES = \ - dc_function_calculate_nextcheck.c + dc_function_calculate_nextcheck.c dc_function_calculate_nextcheck_LDADD = \ - $(CACHE_LIBS) @SERVER_LIBS@ + $(CACHE_LIBS) @SERVER_LIBS@ dc_function_calculate_nextcheck_LDFLAGS = @SERVER_LDFLAGS@ endif diff --git a/tests/libs/zbxdbcache/dc_function_calculate_nextcheck.yaml b/tests/libs/zbxdbcache/dc_function_calculate_nextcheck.yaml index 6005ad60c24..534b3e72e98 100644 --- a/tests/libs/zbxdbcache/dc_function_calculate_nextcheck.yaml +++ b/tests/libs/zbxdbcache/dc_function_calculate_nextcheck.yaml @@ -1,8 +1,8 @@ --- test case: Schedule time based trigger from 2020-09-01 00:00:00.000000000 +03:00 in: - type: ZBX_FUNCTION_TYPE_TIMER - params: + type: ZBX_FUNCTION_TYPE_TIMER + params: timezone: :Europe/Riga time: 2020-09-01 00:00:00.000000000 +03:00 out: @@ -10,8 +10,8 @@ out: --- test case: Schedule time based trigger from 2020-09-01 00:00:15.000000000 +03:00 in: - type: ZBX_FUNCTION_TYPE_TIMER - params: + type: ZBX_FUNCTION_TYPE_TIMER + params: timezone: :Europe/Riga time: 2020-09-01 00:00:15.000000000 +03:00 out: @@ -19,8 +19,8 @@ out: --- test case: Schedule time based trigger from 2020-09-01 00:00:30.000000000 +03:00 in: - type: ZBX_FUNCTION_TYPE_TIMER - params: + type: ZBX_FUNCTION_TYPE_TIMER + params: timezone: :Europe/Riga time: 2020-09-01 00:00:30.000000000 +03:00 out: @@ -28,7 +28,7 @@ out: --- test case: Schedule 1h,now/h 2020-09-01 10:30:30.000000000 +03:00 in: - type: ZBX_FUNCTION_TYPE_TRENDS + type: ZBX_FUNCTION_TYPE_TRENDS params: 1h,now/h timezone: :Europe/Riga time: 2020-09-01 10:30:30.000000000 +03:00 @@ -37,7 +37,7 @@ out: --- test case: Schedule 1h,now/h 2020-09-01 10:00:00.000000000 +03:00 in: - type: ZBX_FUNCTION_TYPE_TRENDS + type: ZBX_FUNCTION_TYPE_TRENDS params: 1h,now/h timezone: :Europe/Riga time: 2020-09-01 10:00:00.000000000 +03:00 @@ -46,7 +46,7 @@ out: --- test case: Schedule 1h,now/h 2020-09-01 10:59:00.000000000 +03:00 in: - type: ZBX_FUNCTION_TYPE_TRENDS + type: ZBX_FUNCTION_TYPE_TRENDS params: 1h,now/h timezone: :Europe/Riga time: 2020-09-01 10:59:00.000000000 +03:00 @@ -55,7 +55,7 @@ out: --- test case: Schedule 1h,now/d 2020-09-01 10:00:00.000000000 +03:00 in: - type: ZBX_FUNCTION_TYPE_TRENDS + type: ZBX_FUNCTION_TYPE_TRENDS params: 1h,now/d timezone: :Europe/Riga time: 2020-09-01 10:00:00.000000000 +03:00 @@ -64,7 +64,7 @@ out: --- test case: Schedule 1h,now/M+1h 2020-09-01 10:00:00.000000000 +03:00 in: - type: ZBX_FUNCTION_TYPE_TRENDS + type: ZBX_FUNCTION_TYPE_TRENDS params: 1h,now/M+1h timezone: :Europe/Riga time: 2020-09-01 10:00:00.000000000 +03:00 @@ -73,7 +73,7 @@ out: --- test case: Schedule 1h,now/M+1d 2020-09-01 10:00:00.000000000 +03:00 in: - type: ZBX_FUNCTION_TYPE_TRENDS + type: ZBX_FUNCTION_TYPE_TRENDS params: 1h,now/M+1d timezone: :Europe/Riga time: 2020-09-01 10:00:00.000000000 +03:00 @@ -82,7 +82,7 @@ out: --- test case: Schedule 1h,now/M+1d 2020-09-02 10:00:00.000000000 +03:00 in: - type: ZBX_FUNCTION_TYPE_TRENDS + type: ZBX_FUNCTION_TYPE_TRENDS params: 1h,now/M+1d timezone: :Europe/Riga time: 2020-09-02 10:00:00.000000000 +03:00 @@ -91,7 +91,7 @@ out: --- test case: Schedule 1d,now/M+6d/w+1d 2020-09-01 10:00:00.000000000 +03:00 in: - type: ZBX_FUNCTION_TYPE_TRENDS + type: ZBX_FUNCTION_TYPE_TRENDS params: 1h,now/M+6d/w+1d timezone: :Europe/Riga time: 2020-09-01 10:00:00.000000000 +03:00 @@ -100,7 +100,7 @@ out: --- test case: Schedule 1d,now/M+6d/w+1d 2020-09-09 10:00:00.000000000 +03:00 in: - type: ZBX_FUNCTION_TYPE_TRENDS + type: ZBX_FUNCTION_TYPE_TRENDS params: 1h,now/M+6d/w+1d timezone: :Europe/Riga time: 2020-09-09 10:00:00.000000000 +03:00 @@ -109,7 +109,7 @@ out: --- test case: Schedule 8h,now/d+17h 2020-09-01 10:00:00.000000000 +03:00 in: - type: ZBX_FUNCTION_TYPE_TRENDS + type: ZBX_FUNCTION_TYPE_TRENDS params: 8h,now/d+17h timezone: :Europe/Riga time: 2020-09-01 10:00:00.000000000 +03:00 diff --git a/tests/libs/zbxtrends/zbx_trends_parse_range.yaml b/tests/libs/zbxtrends/zbx_trends_parse_range.yaml index 852966be369..c09707aa261 100644 --- a/tests/libs/zbxtrends/zbx_trends_parse_range.yaml +++ b/tests/libs/zbxtrends/zbx_trends_parse_range.yaml @@ -268,5 +268,3 @@ out: end: 2019-12-31 23:00:00.000000000 +02:00 return: SUCCEED ... - - |