[ovs-git] [openvswitch/ovs] bde2e7: Revert "system-traffic: Remove netcat from ICMP te...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/openvswitch/ovs
  Commit: bde2e7b5ffd95ff3c7c6f66f24518494702c9462
      https://github.com/openvswitch/ovs/commit/bde2e7b5ffd95ff3c7c6f66f24518494702c9462
  Author: Lance Richardson <lrichard at redhat.com>
  Date:   2016-01-25 (Mon, 25 Jan 2016)

  Changed paths:
    M tests/system-traffic.at

  Log Message:
  -----------
  Revert "system-traffic: Remove netcat from ICMP test."

Revert previous workaround for netcat portability issue.

This reverts commit dc55e9465511dee6c12dbf0edb4ce2d9af57cb15.

Signed-off-by: Lance Richardson <lrichard at redhat.com>
Signed-off-by: Joe Stringer <joe at ovn.org>


  Commit: b54971f72ec6775564f26642f2696e37eabb23be
      https://github.com/openvswitch/ovs/commit/b54971f72ec6775564f26642f2696e37eabb23be
  Author: Lance Richardson <lrichard at redhat.com>
  Date:   2016-01-25 (Mon, 25 Jan 2016)

  Changed paths:
    M tests/atlocal.in
    M tests/system-traffic.at

  Log Message:
  -----------
  system-traffic: use appropriate nc options for installed version

Test cases using netcat ("ICMP related" and "ICMP related with NAT")
currently fail on systems using the nmap version of nc because this
version does not support the -q command-line option.

Fix this by detecting which version of netcat is is in use and
using the "--send-only" command-line option when the nmap flavor
is detected, and using "-q 1" otherwise (openbsd and traditional
versions).

Tested via "make check-kernel" on RHEL7 (nmap version of nc),
Debian 8.2 (openbsd version of nc), and Ubuntu 14.04 ("traditional" nc).

Signed-off-by: Lance Richardson <lrichard at redhat.com>
Signed-off-by: Joe Stringer <joe at ovn.org>


Compare: https://github.com/openvswitch/ovs/compare/83a31283dcb3...b54971f72ec6