summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2016-11-04 22:07:42 +0100
committerandroid-build-merger <android-build-merger@google.com>2016-11-04 22:07:42 +0100
commit8269eb0d1fabae67df9000b0fcc1a095175db1a4 (patch)
treeb4dbfa0122c7e39b0ed8ad0798792cb0f088b49d
parentMerge "Cleanup the duplicates of logs rotation functions" am: e2d05c5658 (diff)
parentMerge "updater: Add a testcase for RenameFn()." (diff)
downloadandroid_bootable_recovery-8269eb0d1fabae67df9000b0fcc1a095175db1a4.tar
android_bootable_recovery-8269eb0d1fabae67df9000b0fcc1a095175db1a4.tar.gz
android_bootable_recovery-8269eb0d1fabae67df9000b0fcc1a095175db1a4.tar.bz2
android_bootable_recovery-8269eb0d1fabae67df9000b0fcc1a095175db1a4.tar.lz
android_bootable_recovery-8269eb0d1fabae67df9000b0fcc1a095175db1a4.tar.xz
android_bootable_recovery-8269eb0d1fabae67df9000b0fcc1a095175db1a4.tar.zst
android_bootable_recovery-8269eb0d1fabae67df9000b0fcc1a095175db1a4.zip
-rw-r--r--tests/component/updater_test.cpp29
-rw-r--r--updater/install.cpp5
2 files changed, 33 insertions, 1 deletions
diff --git a/tests/component/updater_test.cpp b/tests/component/updater_test.cpp
index 337769e6b..f922933cd 100644
--- a/tests/component/updater_test.cpp
+++ b/tests/component/updater_test.cpp
@@ -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);
+}
diff --git a/updater/install.cpp b/updater/install.cpp
index 25f6a9106..ed55ea517 100644
--- a/updater/install.cpp
+++ b/updater/install.cpp
@@ -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);