fix: adjust bin/maas-rack to usr/bin/maas-rack for resolute (#220)

Author: r00ta

src/provisioningserver/utils/fs.py

@@ -40,11 +40,11 @@ def get_maas_common_command():
     if is_dev_environment():
         from maastesting import dev_root
 
-        return os.path.join(dev_root, "bin/maas-common")
+        return os.path.join(dev_root, "usr/bin/maas-common")
     elif snap.running_in_snap():
         # there's no maas-common in the snap as maas-rack is always present
         return os.path.join(
-            snap.SnapPaths.from_environ().snap, "bin/maas-rack"
+            snap.SnapPaths.from_environ().snap, "usr/bin/maas-rack"
         )
     else:
         return get_path("usr/lib/maas/maas-common")

src/provisioningserver/utils/tests/test_fs.py

@@ -412,14 +412,14 @@ def test_returns_maas_rack_for_snap(self):
         provisioningserver.config.is_dev_environment.return_value = False
         self.patch(os, "environ", {"SNAP": "/snap/maas/10"})
         self.assertEqual(
-            get_maas_common_command(), "/snap/maas/10/bin/maas-rack"
+            get_maas_common_command(), "/snap/maas/10/usr/bin/maas-rack"
         )
 
     def test_returns_full_path_for_development(self):
         self.patch(provisioningserver.config, "is_dev_environment")
         provisioningserver.config.is_dev_environment.return_value = True
         self.assertEqual(
-            dev_root.rstrip("/") + "/bin/maas-common",
+            dev_root.rstrip("/") + "/usr/bin/maas-common",
             get_maas_common_command(),
         )