Unify after rebase

canonical · Dec 17, 2024 · 36e630f · 36e630f
1 parent bc08d4b
commit 36e630f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/platform/platform_unix.cpp b/src/platform/platform_unix.cpp
@@ -63,7 +63,7 @@ bool mp::platform::Platform::set_permissions(const Path& path, const Perms permi
     return QFile::setPermissions(path, permissions);
 }
 
-bool mp::platform::Platform::take_ownership(const mp::Path& path) const
+bool mp::platform::Platform::take_ownership(const Path& path) const
 {
     return this->chown(path.toStdString().c_str(), 0, 0) == 0;
 }

diff --git a/tests/mock_platform.h b/tests/mock_platform.h
@@ -40,13 +40,9 @@ class MockPlatform : public platform::Platform
     MOCK_METHOD(bool, is_remote_supported, (const std::string&), (const, override));
     MOCK_METHOD(bool, is_backend_supported, (const QString&), (const, override));
     MOCK_METHOD(bool, is_alias_supported, (const std::string&, const std::string&), (const, override));
-    MOCK_METHOD(bool, set_permissions, (const multipass::Path&, const QFileDevice::Permissions), (const, override));
     MOCK_METHOD(int, chown, (const char*, unsigned int, unsigned int), (const, override));
-    MOCK_METHOD(bool,
-                set_permissions,
-                (const multipass::Path& path, const QFileDevice::Permissions),
-                (const, override));
-    MOCK_METHOD(bool, take_ownership, (const multipass::Path& path), (const, override));
+    MOCK_METHOD(bool, set_permissions, (const Path&, const Perms), (const, override));
+    MOCK_METHOD(bool, take_ownership, (const Path&), (const, override));
     MOCK_METHOD(bool, link, (const char*, const char*), (const, override));
     MOCK_METHOD(bool, symlink, (const char*, const char*, bool), (const, override));
     MOCK_METHOD(int, utime, (const char*, int, int), (const, override));