summaryrefslogtreecommitdiffstats
path: root/documentapi/src/tests
diff options
context:
space:
mode:
authorTor Brede Vekterli <vekterli@oath.com>2018-04-06 17:32:25 +0200
committerGitHub <noreply@github.com>2018-04-06 17:32:25 +0200
commit0c53bdeeef4a5a0733c4db431b73891a670973af (patch)
treeca8e1786802cd76bd85e3674cdf96f0189c67540 /documentapi/src/tests
parentae16f5c60a31b9a8065a740f51a9c208002cc5ed (diff)
Revert "Write DocumentAPI test data in two phases"
Diffstat (limited to 'documentapi/src/tests')
-rw-r--r--documentapi/src/tests/messages/testbase.cpp14
1 files changed, 5 insertions, 9 deletions
diff --git a/documentapi/src/tests/messages/testbase.cpp b/documentapi/src/tests/messages/testbase.cpp
index 9ccaa7abf2f..02c180853d4 100644
--- a/documentapi/src/tests/messages/testbase.cpp
+++ b/documentapi/src/tests/messages/testbase.cpp
@@ -175,18 +175,14 @@ TestBase::dump(const mbus::Blob& blob) const
bool
TestBase::writeFile(const string &filename, const mbus::Blob& blob) const
{
- std::string tmp_filename = filename + ".tmp";
- int file = open(tmp_filename.c_str(), O_WRONLY | O_CREAT | O_TRUNC, 0644);
+ int file = open(filename.c_str(), O_WRONLY | O_CREAT | O_TRUNC, 0644);
if (file == -1) {
return false;
}
- if (write(file, blob.data(), blob.size()) != static_cast<ssize_t>(blob.size())) {
- throw vespalib::Exception("write failed");
+ if (write(file, blob.data(), blob.size()) != (ssize_t)blob.size()) {
+ throw vespalib::Exception("write failed");
}
close(file);
- if (rename(tmp_filename.c_str(), filename.c_str()) != 0) {
- throw vespalib::Exception("rename failed");
- }
return true;
}
@@ -199,8 +195,8 @@ TestBase::readFile(const string &filename) const
if (file != -1) {
lseek(file, 0, SEEK_SET);
if (read(file, blob.data(), len) != len) {
- throw vespalib::Exception("read failed");
- }
+ throw vespalib::Exception("read failed");
+ }
close(file);
}