git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tunproxy
[sliver-openvswitch.git]
/
tests
/
test-ovsdb.c
diff --git
a/tests/test-ovsdb.c
b/tests/test-ovsdb.c
index
d448109
..
658259e
100644
(file)
--- a/
tests/test-ovsdb.c
+++ b/
tests/test-ovsdb.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2009, 2010, 2011, 2012 Nicira, Inc.
+ * Copyright (c) 2009, 2010, 2011, 2012
, 2013
Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-218,13
+218,16
@@
unbox_json(struct json *json)
}
}
}
}
-static
void
+static
size_t
print_and_free_json(struct json *json)
{
char *string = json_to_string(json, JSSF_SORT);
print_and_free_json(struct json *json)
{
char *string = json_to_string(json, JSSF_SORT);
+ size_t length = strlen(string);
json_destroy(json);
puts(string);
free(string);
json_destroy(json);
puts(string);
free(string);
+
+ return length;
}
static void
}
static void
@@
-442,7
+445,10
@@
do_parse_atoms(int argc, char *argv[])
if (error) {
print_and_free_ovsdb_error(error);
} else {
if (error) {
print_and_free_ovsdb_error(error);
} else {
- print_and_free_json(ovsdb_atom_to_json(&atom, base.type));
+ size_t length;
+
+ length = print_and_free_json(ovsdb_atom_to_json(&atom, base.type));
+ ovs_assert(length == ovsdb_atom_json_length(&atom, base.type));
ovsdb_atom_destroy(&atom, base.type);
}
}
ovsdb_atom_destroy(&atom, base.type);
}
}
@@
-494,12
+500,14
@@
do_parse_data__(int argc, char *argv[],
for (i = 2; i < argc; i++) {
struct ovsdb_datum datum;
for (i = 2; i < argc; i++) {
struct ovsdb_datum datum;
+ size_t length;
json = unbox_json(parse_json(argv[i]));
check_ovsdb_error(parse(&datum, &type, json, NULL));
json_destroy(json);
json = unbox_json(parse_json(argv[i]));
check_ovsdb_error(parse(&datum, &type, json, NULL));
json_destroy(json);
- print_and_free_json(ovsdb_datum_to_json(&datum, &type));
+ length = print_and_free_json(ovsdb_datum_to_json(&datum, &type));
+ ovs_assert(length == ovsdb_datum_json_length(&datum, &type));
ovsdb_datum_destroy(&datum, &type);
}
ovsdb_datum_destroy(&datum, &type);
}
@@
-1880,7
+1888,7
@@
do_idl(int argc, char *argv[])
idltest_init();
idltest_init();
- idl = ovsdb_idl_create(argv[1], &idltest_idl_class, true);
+ idl = ovsdb_idl_create(argv[1], &idltest_idl_class, true
, true
);
if (argc > 2) {
struct stream *stream;
if (argc > 2) {
struct stream *stream;