diff options
author | Raman Tenneti <rtenneti@google.com> | 2020-02-13 04:08:09 +0100 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-02-13 04:08:09 +0100 |
commit | 4139a30ec532d0f0cfcd73cd929d30dc74e98597 (patch) | |
tree | 3d8fd06b997afa96379dd4623f341abab218bdd5 /tests | |
parent | Merge "Force package installation with FUSE unless the package stores on device" into qt-qpr1-dev-plus-aosp (diff) | |
parent | Revert "Force package installation with FUSE unless the package stores on device" (diff) | |
download | android_bootable_recovery-4139a30ec532d0f0cfcd73cd929d30dc74e98597.tar android_bootable_recovery-4139a30ec532d0f0cfcd73cd929d30dc74e98597.tar.gz android_bootable_recovery-4139a30ec532d0f0cfcd73cd929d30dc74e98597.tar.bz2 android_bootable_recovery-4139a30ec532d0f0cfcd73cd929d30dc74e98597.tar.lz android_bootable_recovery-4139a30ec532d0f0cfcd73cd929d30dc74e98597.tar.xz android_bootable_recovery-4139a30ec532d0f0cfcd73cd929d30dc74e98597.tar.zst android_bootable_recovery-4139a30ec532d0f0cfcd73cd929d30dc74e98597.zip |
Diffstat (limited to 'tests')
-rw-r--r-- | tests/Android.bp | 1 | ||||
-rw-r--r-- | tests/unit/install_test.cpp | 28 |
2 files changed, 0 insertions, 29 deletions
diff --git a/tests/Android.bp b/tests/Android.bp index 4c23255ad..bde1bc5f3 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -92,7 +92,6 @@ librecovery_static_libs = [ "libhidlbase", "liblp", "libtinyxml2", - "libc++fs", ] cc_test { diff --git a/tests/unit/install_test.cpp b/tests/unit/install_test.cpp index ecf1c9a61..370fbdcc5 100644 --- a/tests/unit/install_test.cpp +++ b/tests/unit/install_test.cpp @@ -34,7 +34,6 @@ #include "install/install.h" #include "install/wipe_device.h" #include "otautil/paths.h" -#include "otautil/roots.h" #include "private/setup_commands.h" static void BuildZipArchive(const std::map<std::string, std::string>& file_map, int fd, @@ -514,30 +513,3 @@ TEST(InstallTest, CheckPackageMetadata_ab_post_timestamp) { "\n"); TestCheckPackageMetadata(metadata, OtaType::AB, true); } - -TEST(InstallTest, SetupPackageMount_package_path) { - load_volume_table(); - bool install_with_fuse; - - // Setup should fail if the input path doesn't exist. - ASSERT_FALSE(SetupPackageMount("/does_not_exist", &install_with_fuse)); - - // Package should be installed with fuse if it's not in /cache. - TemporaryDir temp_dir; - TemporaryFile update_package(temp_dir.path); - ASSERT_TRUE(SetupPackageMount(update_package.path, &install_with_fuse)); - ASSERT_TRUE(install_with_fuse); - - // Setup should fail if the input path isn't canonicalized. - std::string uncanonical_package_path = android::base::Join( - std::vector<std::string>{ - temp_dir.path, - "..", - android::base::Basename(temp_dir.path), - android::base::Basename(update_package.path), - }, - '/'); - - ASSERT_EQ(0, access(uncanonical_package_path.c_str(), R_OK)); - ASSERT_FALSE(SetupPackageMount(uncanonical_package_path, &install_with_fuse)); -} |