[ovs-git] Open vSwitch: jsonrpc: Only compose message to log if it's really going to be logged. (branch-1.9)
dev at openvswitch.org
dev at openvswitch.org
Fri Oct 25 18:29:52 UTC 2013
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, branch-1.9 has been updated
via e2e7edaa567bab181016785102a4bd27eb4518a4 (commit)
via 5ddf54f9298b865d3d492f598626d639d7aba87f (commit)
from 1e514f63738e7d1f7d64359e24b30adf6492f7ff (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 e2e7edaa567bab181016785102a4bd27eb4518a4
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=e2e7edaa567bab181016785102a4bd27eb4518a4
Author: Ben Pfaff <blp at nicira.com>
jsonrpc: Only compose message to log if it's really going to be logged.
This suppresses a testsuite failure when the testsuite is run from a
directory whose name contains a non-ASCII character. I'd rather fix the
problem but webpages like the following make it sound difficult or
impossible on Python 2.x: http://stackoverflow.com/a/11742928
Signed-off-by: Ben Pfaff <blp at nicira.com>
commit 5ddf54f9298b865d3d492f598626d639d7aba87f
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=5ddf54f9298b865d3d492f598626d639d7aba87f
Author: Ben Pfaff <blp at nicira.com>
tests: Skip Python daemon tests in directory with non-ASCII name.
The Debian autobuild machines run their builds inside a top-level
directory named /«BUILDDIR». That name contains two non-ASCII characters
that cause the Python code in the interface-reconfigure and ovs-monitor-ipsec
tests to fail. The problem seems to be related to the locale, because
switching to a UTF-8 locale allows the tests to proceed farther but does
not fix the problem. I was not able to easily fix the actual problem.
Web searches turn up articles that imply that the problem is not
reasonably fixable with Python 2.x, e.g.:
http://stackoverflow.com/a/11742928
This commit instead avoids the problem by skipping these tests if the
current working directory's name contains non-ASCII characters. This is
a legitimate solution only because interface-reconfigure and
ovs-monitor-ipsec run from initscripts and thus their current working
directories are system directories. (Also, the current working directory
matters much less when run in a real environment because the --root-prefix
option that causes the issue is not used in a real environment.)
Signed-off-by: Ben Pfaff <blp at nicira.com>
-----------------------------------------------------------------------
Summary of changes:
python/ovs/jsonrpc.py | 5 +++--
python/ovs/vlog.py | 23 +++++++++++++++++++++++
tests/atlocal.in | 15 +++++++++++++++
tests/interface-reconfigure.at | 4 ++++
tests/ovs-monitor-ipsec.at | 1 +
5 files changed, 46 insertions(+), 2 deletions(-)
hooks/post-receive
--
Open vSwitch
More information about the git
mailing list