Rename os_version to os.version and fix macos version string.

Signed-off-by: Tom Forbes <tom@tomforb.es>

Author: orf

src/image/descriptor.rs

@@ -102,7 +102,7 @@ pub struct Platform {
     /// manifests where os.version is not known to work with the host OS
     /// version. Valid values are implementation-defined. e.g.
     /// 10.0.14393.1066 on windows.
-    #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(rename = "os.version", skip_serializing_if = "Option::is_none")]
     #[builder(default)]
     os_version: Option<String>,
     /// This OPTIONAL property specifies an array of strings, each

src/image/mod.rs

@@ -231,6 +231,8 @@ impl From<&str> for Os {
             "aix" => Os::AIX,
             "android" => Os::Android,
             "darwin" => Os::Darwin,
+            // std::env::consts::OS returns "macos" instead of darwin
+            "macos" => Os::Darwin,
             "dragonfly" => Os::DragonFlyBSD,
             "freebsd" => Os::FreeBSD,
             "hurd" => Os::Hurd,

src/runtime/mod.rs

@@ -295,7 +295,7 @@ mod tests {
                 .expect("failed to canonicalize rootfs");
 
             assert_eq!(
-                &rootfs_absolute_path,
+                &rootfs_absolute_path.canonicalize().unwrap(),
                 spec.root.expect("no root in spec").path()
             );
         }
@@ -310,7 +310,7 @@ mod tests {
                 .expect("failed to canonicalize rootfs");
 
             assert_eq!(
-                &rootfs_absolute_path,
+                &rootfs_absolute_path.canonicalize().unwrap(),
                 spec.root.expect("no root in spec").path()
             );
         }