X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Ftest-ovsdb.c;h=41308d5233cd71da3442b0610711325a1d713e07;hb=55e199190427d962831486b5cec0d1723519a197;hp=48a5007f36dc5f018a56073b29e69619088b300d;hpb=7446f1480bb27ccb63feab066d901cc940d52462;p=openvswitch diff --git a/tests/test-ovsdb.c b/tests/test-ovsdb.c index 48a5007f..41308d52 100644 --- a/tests/test-ovsdb.c +++ b/tests/test-ovsdb.c @@ -1735,12 +1735,7 @@ idl_set(struct ovsdb_idl *idl, char *commands, int step) } } - while ((status = ovsdb_idl_txn_commit(txn)) == TXN_INCOMPLETE) { - ovsdb_idl_run(idl); - ovsdb_idl_wait(idl); - ovsdb_idl_txn_wait(txn); - poll_block(); - } + status = ovsdb_idl_txn_commit_block(txn); printf("%03d: commit, status=%s", step, ovsdb_idl_txn_status_to_string(status)); if (increment) { @@ -1769,7 +1764,8 @@ do_idl(int argc, char *argv[]) if (argc > 2) { struct stream *stream; - error = stream_open_block(argv[1], &stream); + error = stream_open_block(jsonrpc_stream_open(argv[1], &stream), + &stream); if (error) { ovs_fatal(error, "failed to connect to \"%s\"", argv[1]); }