summaryrefslogtreecommitdiffstats
path: root/vespalib/src/tests/io
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@yahoo-inc.com>2016-08-10 12:38:42 +0000
committerTor Egge <Tor.Egge@yahoo-inc.com>2016-08-10 12:38:42 +0000
commitfad0dedbfc0ef724a753974a951a1794f7f8c6ac (patch)
tree8d4debd255a1ecd4c3d0fd4fd74672045d5ae8cf /vespalib/src/tests/io
parentd53a47d1b3106f3eef338ee8266adb1431fadeaf (diff)
Use 'x' instead of '0' as "normalized number", as requested in review feedback.
Diffstat (limited to 'vespalib/src/tests/io')
-rw-r--r--vespalib/src/tests/io/fileutil/fileutiltest.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/vespalib/src/tests/io/fileutil/fileutiltest.cpp b/vespalib/src/tests/io/fileutil/fileutiltest.cpp
index 0ec2fbb588f..15db45dc992 100644
--- a/vespalib/src/tests/io/fileutil/fileutiltest.cpp
+++ b/vespalib/src/tests/io/fileutil/fileutiltest.cpp
@@ -19,13 +19,13 @@ vespalib::string normalizeOpenError(const vespalib::string str)
std::regex mtimeex(" mtime=[0-9]+");
std::regex errnoex(" errno=[0-9]+\\(\"[^\"]+\"\\)");
std::regex errorex("^error=[0-9]+\\(\"[^\"]+\"\\)");
- std::string tmp1 = std::regex_replace(std::string(str), modeex, " mode=0");
- std::string tmp2 = std::regex_replace(tmp1, uidex, " uid=0");
- tmp1 = std::regex_replace(tmp2, gidex, " gid=0");
- tmp2 = std::regex_replace(tmp1, sizeex, " size=0");
- tmp1 = std::regex_replace(tmp2, mtimeex, " mtime=0");
- tmp2 = std::regex_replace(tmp1, errnoex, " errno=0");
- tmp1 = std::regex_replace(tmp2, errorex, "error=0");
+ std::string tmp1 = std::regex_replace(std::string(str), modeex, " mode=x");
+ std::string tmp2 = std::regex_replace(tmp1, uidex, " uid=x");
+ tmp1 = std::regex_replace(tmp2, gidex, " gid=x");
+ tmp2 = std::regex_replace(tmp1, sizeex, " size=x");
+ tmp1 = std::regex_replace(tmp2, mtimeex, " mtime=x");
+ tmp2 = std::regex_replace(tmp1, errnoex, " errno=x");
+ tmp1 = std::regex_replace(tmp2, errorex, "error=x");
return tmp1;
}
@@ -727,13 +727,13 @@ Test::testGetOpenErrorString()
}
vespalib::string err1 = getOpenErrorString(1, "mydir/foo");
vespalib::string normErr1 = normalizeOpenError(err1);
- vespalib::string expErr1 = "error=0 fileStat[name=mydir/foo mode=0 uid=0 gid=0 size=0 mtime=0] dirStat[name=mydir mode=0 uid=0 gid=0 size=0 mtime=0]";
+ vespalib::string expErr1 = "error=x fileStat[name=mydir/foo mode=x uid=x gid=x size=x mtime=x] dirStat[name=mydir mode=x uid=x gid=x size=x mtime=x]";
std::cout << "getOpenErrorString(1, \"mydir/foo\") is " << err1 <<
", normalized to " << normErr1 << std::endl;
ASSERT_EQUAL(expErr1, normErr1);
vespalib::string err2 = getOpenErrorString(1, "notFound");
vespalib::string normErr2 = normalizeOpenError(err2);
- vespalib::string expErr2 = "error=0 fileStat[name=notFound errno=0] dirStat[name=. mode=0 uid=0 gid=0 size=0 mtime=0]";
+ vespalib::string expErr2 = "error=x fileStat[name=notFound errno=x] dirStat[name=. mode=x uid=x gid=x size=x mtime=x]";
std::cout << "getOpenErrorString(1, \"notFound\") is " << err2 <<
", normalized to " << normErr2 << std::endl;
ASSERT_EQUAL(expErr2, normErr2);