tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "updater: Add a testcase for RenameFn()."

Browse source
This commit is contained in:
Tao Bao 2016-11-04 21:01:11 +00:00 committed by Gerrit Code Review
commit d0daf7f7df
2 changed files with 33 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
tests/component/updater_test.cpp
View file

@ -180,3 +180,32 @@ TEST_F(UpdaterTest, delete) {
"\", \"/doesntexist2\")");
expect("1", script3.c_str(), kNoCause);
}
TEST_F(UpdaterTest, rename) {
// rename() expects two arguments.
expect(nullptr, "rename()", kArgsParsingFailure);
expect(nullptr, "rename(\"arg1\")", kArgsParsingFailure);
expect(nullptr, "rename(\"arg1\", \"arg2\", \"arg3\")", kArgsParsingFailure);
// src_name or dst_name cannot be empty.
expect(nullptr, "rename(\"\", \"arg2\")", kArgsParsingFailure);
expect(nullptr, "rename(\"arg1\", \"\")", kArgsParsingFailure);
// File doesn't exist (both of src and dst).
expect(nullptr, "rename(\"/doesntexist\", \"/doesntexisteither\")" , kFileRenameFailure);
// Can't create parent directory.
TemporaryFile temp_file1;
ASSERT_TRUE(android::base::WriteStringToFile("abc", temp_file1.path));
std::string script1("rename(\"" + std::string(temp_file1.path) + "\", \"/proc/0/file1\")");
expect(nullptr, script1.c_str(), kFileRenameFailure);
// Rename.
TemporaryFile temp_file2;
std::string script2("rename(\"" + std::string(temp_file1.path) + "\", \"" +
std::string(temp_file2.path) + "\")");
expect(temp_file2.path, script2.c_str(), kNoCause);
// Already renamed.
expect(temp_file2.path, script2.c_str(), kNoCause);
}

5
updater/install.cpp
View file

@ -293,7 +293,7 @@ Value* FormatFn(const char* name, State* state, int argc, Expr* argv[]) {
}
int64_t size;
if (!android::base::ParseInt(fs_size.c_str(), &size)) {
if (!android::base::ParseInt(fs_size, &size)) {
return ErrorAbort(state, kArgsParsingFailure,
"%s: failed to parse int in %s\n", name, fs_size.c_str());
}
@ -329,6 +329,9 @@ Value* FormatFn(const char* name, State* state, int argc, Expr* argv[]) {
return nullptr;
}
// rename(src_name, dst_name)
// Renames src_name to dst_name. It automatically creates the necessary directories for dst_name.
// Example: rename("system/app/Hangouts/Hangouts.apk", "system/priv-app/Hangouts/Hangouts.apk")
Value* RenameFn(const char* name, State* state, int argc, Expr* argv[]) {
if (argc != 2) {
return ErrorAbort(state, kArgsParsingFailure, "%s() expects 2 args, got %d", name, argc);