X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=t%2Funit%2Fcore%2Fstore_json_test.c;h=f8ebac913633fe025df01344c2e2ecab521874cc;hp=d887c439f0bddbb4c21572402d27e9d490245d24;hb=90174606fdfac1dba1330b48cb16bb2ca1efb0a4;hpb=bdc839955f8ebe45f07f4c6f8886e6fc7afc2466

diff --git a/t/unit/core/store_json_test.c b/t/unit/core/store_json_test.c
index d887c43..f8ebac9 100644
--- a/t/unit/core/store_json_test.c
+++ b/t/unit/core/store_json_test.c
@@ -29,7 +29,6 @@
 #	include "config.h"
 #endif
 
-#include "core/plugin.h"
 #include "core/store.h"
 #include "testutils.h"
 
@@ -173,9 +172,6 @@ struct {
 						"\"last_update\": \"1970-01-01 00:00:02 +0000\", "
 						"\"update_interval\": \"0s\", \"backends\": [], "
 						"\"attributes\": ["
-							"{\"name\": \"hostname\", \"value\": \"h1\", "
-								"\"last_update\": \"1970-01-01 00:00:02 +0000\", "
-								"\"update_interval\": \"0s\", \"backends\": []},"
 							"{\"name\": \"k3\", \"value\": 42, "
 								"\"last_update\": \"1970-01-01 00:00:02 +0000\", "
 								"\"update_interval\": \"0s\", \"backends\": []}"
@@ -183,12 +179,7 @@ struct {
 					"{\"name\": \"m2\", "
 						"\"timeseries\": false, "
 						"\"last_update\": \"1970-01-01 00:00:01 +0000\", "
-						"\"update_interval\": \"0s\", \"backends\": [], "
-						"\"attributes\": ["
-							"{\"name\": \"hostname\", \"value\": \"h1\", "
-								"\"last_update\": \"1970-01-01 00:00:01 +0000\", "
-								"\"update_interval\": \"0s\", \"backends\": []}"
-						"]}"
+						"\"update_interval\": \"0s\", \"backends\": []}"
 				"]},"
 			"{\"name\": \"h2\", \"last_update\": \"1970-01-01 00:00:03 +0000\", "
 				"\"update_interval\": \"0s\", \"backends\": [], "
@@ -196,29 +187,16 @@ struct {
 					"{\"name\": \"m1\", "
 						"\"timeseries\": false, "
 						"\"last_update\": \"1970-01-01 00:00:01 +0000\", "
-						"\"update_interval\": \"0s\", \"backends\": [], "
-						"\"attributes\": ["
-							"{\"name\": \"hostname\", \"value\": \"h2\", "
-								"\"last_update\": \"1970-01-01 00:00:01 +0000\", "
-								"\"update_interval\": \"0s\", \"backends\": []}"
-						"]}"
+						"\"update_interval\": \"0s\", \"backends\": []}"
 				"], "
 				"\"services\": ["
 					"{\"name\": \"s1\", "
 						"\"last_update\": \"1970-01-01 00:00:01 +0000\", "
-						"\"update_interval\": \"0s\", \"backends\": [], "
-						"\"attributes\": ["
-							"{\"name\": \"hostname\", \"value\": \"h2\", "
-								"\"last_update\": \"1970-01-01 00:00:01 +0000\", "
-								"\"update_interval\": \"0s\", \"backends\": []}"
-						"]},"
+						"\"update_interval\": \"0s\", \"backends\": []},"
 					"{\"name\": \"s2\", "
 						"\"last_update\": \"1970-01-01 00:00:02 +0000\", "
 						"\"update_interval\": \"0s\", \"backends\": [], "
 						"\"attributes\": ["
-							"{\"name\": \"hostname\", \"value\": \"h2\", "
-								"\"last_update\": \"1970-01-01 00:00:02 +0000\", "
-								"\"update_interval\": \"0s\", \"backends\": []},"
 							"{\"name\": \"k1\", \"value\": 123, "
 								"\"last_update\": \"1970-01-01 00:00:02 +0000\", "
 								"\"update_interval\": \"0s\", \"backends\": []},"
@@ -254,9 +232,6 @@ struct {
 						"\"last_update\": \"1970-01-01 00:00:02 +0000\", "
 						"\"update_interval\": \"0s\", \"backends\": [], "
 						"\"attributes\": ["
-							"{\"name\": \"hostname\", \"value\": \"h2\", "
-								"\"last_update\": \"1970-01-01 00:00:02 +0000\", "
-								"\"update_interval\": \"0s\", \"backends\": []},"
 							"{\"name\": \"k1\", \"value\": 123, "
 								"\"last_update\": \"1970-01-01 00:00:02 +0000\", "
 								"\"update_interval\": \"0s\", \"backends\": []}"
@@ -278,12 +253,7 @@ struct {
 					"{\"name\": \"m2\", "
 						"\"timeseries\": false, "
 						"\"last_update\": \"1970-01-01 00:00:01 +0000\", "
-						"\"update_interval\": \"0s\", \"backends\": [], "
-						"\"attributes\": ["
-							"{\"name\": \"hostname\", \"value\": \"h1\", "
-								"\"last_update\": \"1970-01-01 00:00:01 +0000\", "
-								"\"update_interval\": \"0s\", \"backends\": []}"
-						"]}"
+						"\"update_interval\": \"0s\", \"backends\": []}"
 				"]}"
 		"]" },
 	{ { sdb_store_ge_matcher, SDB_FIELD_LAST_UPDATE,
@@ -306,19 +276,11 @@ struct {
 				"\"services\": ["
 					"{\"name\": \"s1\", "
 						"\"last_update\": \"1970-01-01 00:00:01 +0000\", "
-						"\"update_interval\": \"0s\", \"backends\": [], "
-						"\"attributes\": ["
-							"{\"name\": \"hostname\", \"value\": \"h2\", "
-								"\"last_update\": \"1970-01-01 00:00:01 +0000\", "
-								"\"update_interval\": \"0s\", \"backends\": []}"
-						"]},"
+						"\"update_interval\": \"0s\", \"backends\": []},"
 					"{\"name\": \"s2\", "
 						"\"last_update\": \"1970-01-01 00:00:02 +0000\", "
 						"\"update_interval\": \"0s\", \"backends\": [], "
 						"\"attributes\": ["
-							"{\"name\": \"hostname\", \"value\": \"h2\", "
-								"\"last_update\": \"1970-01-01 00:00:02 +0000\", "
-								"\"update_interval\": \"0s\", \"backends\": []},"
 							"{\"name\": \"k1\", \"value\": 123, "
 								"\"last_update\": \"1970-01-01 00:00:02 +0000\", "
 								"\"update_interval\": \"0s\", \"backends\": []},"
@@ -353,9 +315,6 @@ struct {
 						"\"last_update\": \"1970-01-01 00:00:02 +0000\", "
 						"\"update_interval\": \"0s\", \"backends\": [], "
 						"\"attributes\": ["
-							"{\"name\": \"hostname\", \"value\": \"h2\", "
-								"\"last_update\": \"1970-01-01 00:00:02 +0000\", "
-								"\"update_interval\": \"0s\", \"backends\": []},"
 							"{\"name\": \"k1\", \"value\": 123, "
 								"\"last_update\": \"1970-01-01 00:00:02 +0000\", "
 								"\"update_interval\": \"0s\", \"backends\": []}"
@@ -377,9 +336,6 @@ struct {
 						"\"last_update\": \"1970-01-01 00:00:02 +0000\", "
 						"\"update_interval\": \"0s\", \"backends\": [], "
 						"\"attributes\": ["
-							"{\"name\": \"hostname\", \"value\": \"h1\", "
-								"\"last_update\": \"1970-01-01 00:00:02 +0000\", "
-								"\"update_interval\": \"0s\", \"backends\": []},"
 							"{\"name\": \"k3\", \"value\": 42, "
 								"\"last_update\": \"1970-01-01 00:00:02 +0000\", "
 								"\"update_interval\": \"0s\", \"backends\": []}"
@@ -387,12 +343,7 @@ struct {
 					"{\"name\": \"m2\", "
 						"\"timeseries\": false, "
 						"\"last_update\": \"1970-01-01 00:00:01 +0000\", "
-						"\"update_interval\": \"0s\", \"backends\": [], "
-						"\"attributes\": ["
-							"{\"name\": \"hostname\", \"value\": \"h1\", "
-								"\"last_update\": \"1970-01-01 00:00:01 +0000\", "
-								"\"update_interval\": \"0s\", \"backends\": []}"
-						"]}"
+						"\"update_interval\": \"0s\", \"backends\": []}"
 				"]},"
 			"{\"name\": \"h2\", \"last_update\": \"1970-01-01 00:00:03 +0000\", "
 				"\"update_interval\": \"0s\", \"backends\": [], "
@@ -400,12 +351,7 @@ struct {
 					"{\"name\": \"m1\", "
 						"\"timeseries\": false, "
 						"\"last_update\": \"1970-01-01 00:00:01 +0000\", "
-						"\"update_interval\": \"0s\", \"backends\": [], "
-						"\"attributes\": ["
-							"{\"name\": \"hostname\", \"value\": \"h2\", "
-								"\"last_update\": \"1970-01-01 00:00:01 +0000\", "
-								"\"update_interval\": \"0s\", \"backends\": []}"
-						"]}"
+						"\"update_interval\": \"0s\", \"backends\": []}"
 				"]}"
 		"]" },
 	{ { NULL, 0, SDB_DATA_INIT },
@@ -442,12 +388,7 @@ struct {
 					"{\"name\": \"m2\", "
 						"\"timeseries\": false, "
 						"\"last_update\": \"1970-01-01 00:00:01 +0000\", "
-						"\"update_interval\": \"0s\", \"backends\": [], "
-						"\"attributes\": ["
-							"{\"name\": \"hostname\", \"value\": \"h1\", "
-								"\"last_update\": \"1970-01-01 00:00:01 +0000\", "
-								"\"update_interval\": \"0s\", \"backends\": []}"
-						"]}"
+						"\"update_interval\": \"0s\", \"backends\": []}"
 				"]}"
 		"]" },
 	{ { sdb_store_lt_matcher, SDB_FIELD_LAST_UPDATE,