You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2016/02/12 20:26:39 UTC
mesos git commit: Fixed name server parsing for
PortMappingIsolatorTest.
Repository: mesos
Updated Branches:
refs/heads/master d7bf6dff3 -> 7c04395a3
Fixed name server parsing for PortMappingIsolatorTest.
It is valid to contain comments in /etc/resolv.conf, so the quickest fix
for this is to relax the ASSERT.
Review: https://reviews.apache.org/r/43535/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/7c04395a
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/7c04395a
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/7c04395a
Branch: refs/heads/master
Commit: 7c04395a3d1b619ecf705c2f6c405b5c2a4a119e
Parents: d7bf6df
Author: Cong Wang <xi...@gmail.com>
Authored: Fri Feb 12 11:26:08 2016 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Fri Feb 12 11:26:08 2016 -0800
----------------------------------------------------------------------
src/tests/containerizer/port_mapping_tests.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/7c04395a/src/tests/containerizer/port_mapping_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/port_mapping_tests.cpp b/src/tests/containerizer/port_mapping_tests.cpp
index aa98460..1e6cb05 100644
--- a/src/tests/containerizer/port_mapping_tests.cpp
+++ b/src/tests/containerizer/port_mapping_tests.cpp
@@ -255,7 +255,7 @@ protected:
}
vector<string> tokens = strings::split(line, " ");
- ASSERT_EQ(2u, tokens.size()) << "Unexpected format in '/etc/resolv.conf'";
+ ASSERT_LE(2u, tokens.size()) << "Unexpected format in '/etc/resolv.conf'";
if (tokens[1] != "127.0.0.1") {
nameServers.push_back(tokens[1]);
}