Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/zabbix/zabbix.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorVladislavs Sokurenko <vladislavs.sokurenko@zabbix.com>2022-01-07 13:58:55 +0300
committerVladislavs Sokurenko <vladislavs.sokurenko@zabbix.com>2022-01-07 13:59:04 +0300
commit3d30a069e96d296583ef4040cc9c0a2be293981e (patch)
tree8e4cf1d0386f625579278e97b1878f5241da577f /tests
parente2f30c6c11d30bf15a6bb5264dc5402723e9f956 (diff)
.......PS. [ZBXNEXT-2485] fixed tests
Diffstat (limited to 'tests')
-rw-r--r--tests/libs/zbxdbcache/dc_item_poller_type_update.c2
-rw-r--r--tests/libs/zbxdbcache/dc_item_poller_type_update.yaml26
-rw-r--r--tests/zbxmocktest.c1
3 files changed, 15 insertions, 14 deletions
diff --git a/tests/libs/zbxdbcache/dc_item_poller_type_update.c b/tests/libs/zbxdbcache/dc_item_poller_type_update.c
index 9d76d63b619..b4f2aa3860f 100644
--- a/tests/libs/zbxdbcache/dc_item_poller_type_update.c
+++ b/tests/libs/zbxdbcache/dc_item_poller_type_update.c
@@ -94,7 +94,7 @@ static unsigned char str2pollertype(const char *str)
_ZBX_MKMAP(ZBX_NO_POLLER), _ZBX_MKMAP(ZBX_POLLER_TYPE_NORMAL),
_ZBX_MKMAP(ZBX_POLLER_TYPE_UNREACHABLE), _ZBX_MKMAP(ZBX_POLLER_TYPE_IPMI),
_ZBX_MKMAP(ZBX_POLLER_TYPE_PINGER), _ZBX_MKMAP(ZBX_POLLER_TYPE_JAVA),
- _ZBX_MKMAP(ZBX_POLLER_TYPE_HISTORY),
+ _ZBX_MKMAP(ZBX_POLLER_TYPE_HISTORY), _ZBX_MKMAP(ZBX_POLLER_TYPE_ODBC),
{ 0 }
};
diff --git a/tests/libs/zbxdbcache/dc_item_poller_type_update.yaml b/tests/libs/zbxdbcache/dc_item_poller_type_update.yaml
index 203c5ac7e2a..93a27ed6816 100644
--- a/tests/libs/zbxdbcache/dc_item_poller_type_update.yaml
+++ b/tests/libs/zbxdbcache/dc_item_poller_type_update.yaml
@@ -1102,70 +1102,70 @@ in:
key: k
poller: ZBX_NO_POLLER
flags: 0
- result: ZBX_POLLER_TYPE_NORMAL
+ result: ZBX_POLLER_TYPE_ODBC
- ref: 206
access: DIRECT
type: ITEM_TYPE_DB_MONITOR
key: k
poller: ZBX_NO_POLLER
flags: ZBX_ITEM_COLLECTED
- result: ZBX_POLLER_TYPE_NORMAL
+ result: ZBX_POLLER_TYPE_ODBC
- ref: 207
access: DIRECT
type: ITEM_TYPE_DB_MONITOR
key: k
- poller: ZBX_POLLER_TYPE_NORMAL
+ poller: ZBX_POLLER_TYPE_ODBC
flags: 0
- result: ZBX_POLLER_TYPE_NORMAL
+ result: ZBX_POLLER_TYPE_ODBC
- ref: 208
access: DIRECT
type: ITEM_TYPE_DB_MONITOR
key: k
- poller: ZBX_POLLER_TYPE_NORMAL
+ poller: ZBX_POLLER_TYPE_ODBC
flags: ZBX_ITEM_COLLECTED
- result: ZBX_POLLER_TYPE_NORMAL
+ result: ZBX_POLLER_TYPE_ODBC
- ref: 209
access: DIRECT
type: ITEM_TYPE_DB_MONITOR
key: k
poller: ZBX_POLLER_TYPE_IPMI
flags: 0
- result: ZBX_POLLER_TYPE_NORMAL
+ result: ZBX_POLLER_TYPE_ODBC
- ref: 210
access: DIRECT
type: ITEM_TYPE_DB_MONITOR
key: k
poller: ZBX_POLLER_TYPE_IPMI
flags: ZBX_ITEM_COLLECTED
- result: ZBX_POLLER_TYPE_NORMAL
+ result: ZBX_POLLER_TYPE_ODBC
- ref: 211
access: DIRECT
type: ITEM_TYPE_DB_MONITOR
key: k
poller: ZBX_POLLER_TYPE_PINGER
flags: 0
- result: ZBX_POLLER_TYPE_NORMAL
+ result: ZBX_POLLER_TYPE_ODBC
- ref: 212
access: DIRECT
type: ITEM_TYPE_DB_MONITOR
key: k
poller: ZBX_POLLER_TYPE_PINGER
flags: ZBX_ITEM_COLLECTED
- result: ZBX_POLLER_TYPE_NORMAL
+ result: ZBX_POLLER_TYPE_ODBC
- ref: 213
access: DIRECT
type: ITEM_TYPE_DB_MONITOR
key: k
poller: ZBX_POLLER_TYPE_JAVA
flags: 0
- result: ZBX_POLLER_TYPE_NORMAL
+ result: ZBX_POLLER_TYPE_ODBC
- ref: 214
access: DIRECT
type: ITEM_TYPE_DB_MONITOR
key: k
poller: ZBX_POLLER_TYPE_JAVA
flags: ZBX_ITEM_COLLECTED
- result: ZBX_POLLER_TYPE_NORMAL
+ result: ZBX_POLLER_TYPE_ODBC
- ref: 215
access: DIRECT
type: ITEM_TYPE_DB_MONITOR
@@ -1179,7 +1179,7 @@ in:
key: k
poller: ZBX_POLLER_TYPE_UNREACHABLE
flags: ZBX_ITEM_COLLECTED
- result: ZBX_POLLER_TYPE_NORMAL
+ result: ZBX_POLLER_TYPE_ODBC
- ref: 217
access: DIRECT
type: ITEM_TYPE_IPMI
diff --git a/tests/zbxmocktest.c b/tests/zbxmocktest.c
index 9a7408af15e..6177324ccdc 100644
--- a/tests/zbxmocktest.c
+++ b/tests/zbxmocktest.c
@@ -58,6 +58,7 @@ int CONFIG_HISTORYPOLLER_FORKS = 5;
int CONFIG_AVAILMAN_FORKS = 1;
int CONFIG_SERVICEMAN_FORKS = 0;
int CONFIG_PROBLEMHOUSEKEEPER_FORKS = 0;
+int CONFIG_ODBCPOLLER_FORKS = 5;
int CONFIG_LISTEN_PORT = 0;
char *CONFIG_LISTEN_IP = NULL;