[ovs-git] [openvswitch/ovs] 933581: tests/ofproto.at: Workaround some races

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/openvswitch/ovs
  Commit: 9335810807f9c0b784a36c38a8b8807c62ee89fe
      https://github.com/openvswitch/ovs/commit/9335810807f9c0b784a36c38a8b8807c62ee89fe
  Author: Timothy Redaelli <tredaelli at redhat.com>
  Date:   2017-05-05 (Fri, 05 May 2017)

  Changed paths:
    M tests/ofproto.at

  Log Message:
  -----------
  tests/ofproto.at: Workaround some races

Port a variant of commit a6d1a2997db4:
    ofproto.at: Workaround a race

    While a barrier serializes requests from the same connection,
    it doesn't wait for requests from other connections to the switch.
    Replace the barrier with infamous "sleep 1" to workaround the problem.

to the following tests:
    "ofproto - asynchronous message control (OpenFlow 1.0)",
    "ofproto - asynchronous message control (OpenFlow 1.3)",
    "ofproto - asynchronous message control (OpenFlow 1.4)" and
    "ofproto - asynchronous message control (OpenFlow 1.5)"

Do not use "sleep 1", but wait for log file to have (at least) the same
number of lines we expect (it generally waits less time).

Sometimes one of these tests fails because the OFPT_BARRIER_REPLY is
printed before the other message we expect to have.

Suggested-by: Lance Richardson <lrichard at redhat.com>
Signed-off-by: Timothy Redaelli <tredaelli at redhat.com>
Signed-off-by: Ben Pfaff <blp at ovn.org>