[ovs-git] Open vSwitch: tests: Fix unit test failures related to additional logging. (master)

[dev at openvswitch.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Open vSwitch".

The branch, master has been updated
       via  08b9b19009d5fcddc229519010f0c6c317d0b08d (commit)
       via  9dbc190c816b51dad3ca80bb9fb3835769758781 (commit)
       via  1ec3db6fd8cff83555ba496c32324ab78731b6c1 (commit)
      from  fbcbc81484d1945f1f25854e6b549b087ccfaacf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 08b9b19009d5fcddc229519010f0c6c317d0b08d
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=08b9b19009d5fcddc229519010f0c6c317d0b08d
Author: Ethan Jackson <ethan at nicira.com>
		
tests: Fix unit test failures related to additional logging.
		
Commit a890678229 (userspace: Log version on startup.) added
additional logging to ovsdb-server and ovs-vswitchd, but failed to
make certain the unit tests still passed.

Signed-off-by: Ethan Jackson <ethan at nicira.com>
[blp at nicira.com changed the strategy for fixing ovsdb-server.at]
Signed-off-by: Ben Pfaff <blp at nicira.com>


commit 9dbc190c816b51dad3ca80bb9fb3835769758781
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=9dbc190c816b51dad3ca80bb9fb3835769758781
Author: Ethan Jackson <ethan at nicira.com>
		
ovsdb-server, ovs-vswitchd: Log version after daemonize_complete().
		
This fixes unit tests, and generally seems more correct.

Signed-off-by: Ethan Jackson <ethan at nicira.com>
[blp at nicira.com added the change to ovs-vswitchd]
Signed-off-by: Ben Pfaff <blp at nicira.com>


commit 1ec3db6fd8cff83555ba496c32324ab78731b6c1
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=1ec3db6fd8cff83555ba496c32324ab78731b6c1
Author: Ethan Jackson <ethan at nicira.com>
		
ofproto: Fix compiler warnings.
		
This patch fixes the following warnings on my system:

lib/ofp-actions.c:458:13: error: format '%x' expects argument of
type 'unsigned int', but argument 4 has type 'long unsigned int'
[-Werror=format]

ofproto/ofproto.c:3940:13: error: comparison between 'enum
ofoperation_type' and 'enum nx_flow_update_event'
[-Werror=enum-compare]

ofproto/ofproto.c:3941:13: error: comparison between 'enum
ofoperation_type' and 'enum nx_flow_update_event'
[-Werror=enum-compare]

ofproto/ofproto.c:3942:13: error: comparison between 'enum
ofoperation_type' and 'enum nx_flow_update_event'
[-Werror=enum-compare]

Signed-off-by: Ethan Jackson <ethan at nicira.com>
Signed-off-by: Ben Pfaff <blp at nicira.com>


-----------------------------------------------------------------------

Summary of changes:
 lib/ofp-actions.c       |    2 +-
 ofproto/ofproto.c       |    9 ++++++---
 ovsdb/ovsdb-server.c    |    9 +++++++--
 tests/ofproto-macros.at |    5 ++++-
 vswitchd/bridge.c       |    2 ++
 vswitchd/ovs-vswitchd.c |    2 --
 6 files changed, 20 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
Open vSwitch