Fix file_release inadequate testing

* Refactor tests to have more operating system context * Add tests for more edge cases * Order tests alphabetically
JasonHonor · Jul 18, 2022 · e98db60 · e98db60
1 parent 517e13e
commit e98db60
Show file tree

Hide file tree

Showing 27 changed files with 173 additions and 119 deletions.
diff --git a/os_info/src/linux/file_release.rs b/os_info/src/linux/file_release.rs
diff --git a/os_info/src/linux/tests/alpine-release → ...src/linux/tests/Alpine/etc/alpine-release b/os_info/src/linux/tests/alpine-release → ...src/linux/tests/Alpine/etc/alpine-release
diff --git a/...fo/src/linux/tests/os-release-alpine-3-12 → ...rc/linux/tests/Alpine_3_12/etc/os-release b/...fo/src/linux/tests/os-release-alpine-3-12 → ...rc/linux/tests/Alpine_3_12/etc/os-release
diff --git a/os_info/src/linux/tests/os-release-amazon-1 → ...o/src/linux/tests/Amazon_1/etc/os-release b/os_info/src/linux/tests/os-release-amazon-1 → ...o/src/linux/tests/Amazon_1/etc/os-release
diff --git a/os_info/src/linux/tests/os-release-amazon-2 → ...o/src/linux/tests/Amazon_2/etc/os-release b/os_info/src/linux/tests/os-release-amazon-2 → ...o/src/linux/tests/Amazon_2/etc/os-release
diff --git a/os_info/src/linux/tests/centos-release → ...src/linux/tests/CentOS/etc/centos-release b/os_info/src/linux/tests/centos-release → ...src/linux/tests/CentOS/etc/centos-release
diff --git a/os_info/src/linux/tests/os-release-centos → ...o/src/linux/tests/CentOS_7/etc/os-release b/os_info/src/linux/tests/os-release-centos → ...o/src/linux/tests/CentOS_7/etc/os-release
diff --git a/.../src/linux/tests/os-release-centos-stream → .../linux/tests/CentOS_Stream/etc/os-release b/.../src/linux/tests/os-release-centos-stream → .../linux/tests/CentOS_Stream/etc/os-release
diff --git a/os_info/src/linux/tests/CentOS_Unknown/etc/centos-release b/os_info/src/linux/tests/CentOS_Unknown/etc/centos-release
@@ -0,0 +1 @@
+Centos Linux
diff --git a/os_info/src/linux/tests/fedora-release → ...src/linux/tests/Fedora/etc/fedora-release b/os_info/src/linux/tests/fedora-release → ...src/linux/tests/Fedora/etc/fedora-release
diff --git a/os_info/src/linux/tests/os-release-fedora-32 → .../src/linux/tests/Fedora_32/etc/os-release b/os_info/src/linux/tests/os-release-fedora-32 → .../src/linux/tests/Fedora_32/etc/os-release
diff --git a/os_info/src/linux/tests/os-release-fedora-35 → .../src/linux/tests/Fedora_35/etc/os-release b/os_info/src/linux/tests/os-release-fedora-35 → .../src/linux/tests/Fedora_35/etc/os-release
diff --git a/os_info/src/linux/tests/Fedora_Unknown/etc/fedora-release b/os_info/src/linux/tests/Fedora_Unknown/etc/fedora-release
@@ -0,0 +1 @@
+Fedora (Foo Bar)
diff --git a/os_info/src/linux/tests/mariner-release → ...c/linux/tests/Mariner/etc/mariner-release b/os_info/src/linux/tests/mariner-release → ...c/linux/tests/Mariner/etc/mariner-release
diff --git a/os_info/src/linux/tests/Mariner_Unknown/etc/mariner-release b/os_info/src/linux/tests/Mariner_Unknown/etc/mariner-release
@@ -0,0 +1 @@
+CBL-Mariner 
diff --git a/os_info/src/linux/tests/os-release-mint → os_info/src/linux/tests/Mint/etc/os-release b/os_info/src/linux/tests/os-release-mint → os_info/src/linux/tests/Mint/etc/os-release
diff --git a/os_info/src/linux/tests/os-release-nixos → os_info/src/linux/tests/NixOS/etc/os-release b/os_info/src/linux/tests/os-release-nixos → os_info/src/linux/tests/NixOS/etc/os-release
diff --git a/os_info/src/linux/tests/os-release → ...rc/linux/tests/OracleLinux/etc/os-release b/os_info/src/linux/tests/os-release → ...rc/linux/tests/OracleLinux/etc/os-release
diff --git a/os_info/src/linux/tests/OracleLinux/etc/redhat-release b/os_info/src/linux/tests/OracleLinux/etc/redhat-release
@@ -0,0 +1 @@
+Redhat Linux release XX
diff --git a/os_info/src/linux/tests/redhat-release → ...tests/RedHatEnterprise/etc/redhat-release b/os_info/src/linux/tests/redhat-release → ...tests/RedHatEnterprise/etc/redhat-release
diff --git a/os_info/src/linux/tests/os-release-rhel-7 → ...x/tests/RedHatEnterprise_7/etc/os-release b/os_info/src/linux/tests/os-release-rhel-7 → ...x/tests/RedHatEnterprise_7/etc/os-release
diff --git a/os_info/src/linux/tests/os-release-rhel → ...x/tests/RedHatEnterprise_8/etc/os-release b/os_info/src/linux/tests/os-release-rhel → ...x/tests/RedHatEnterprise_8/etc/os-release
diff --git a/os_info/src/linux/tests/RedHatEnterprise_Unknown/etc/redhat-release b/os_info/src/linux/tests/RedHatEnterprise_Unknown/etc/redhat-release
diff --git a/os_info/src/linux/tests/os-release-suse-12 → ...fo/src/linux/tests/SUSE_12/etc/os-release b/os_info/src/linux/tests/os-release-suse-12 → ...fo/src/linux/tests/SUSE_12/etc/os-release
diff --git a/os_info/src/linux/tests/os-release-suse-15 → ...fo/src/linux/tests/SUSE_15/etc/os-release b/os_info/src/linux/tests/os-release-suse-15 → ...fo/src/linux/tests/SUSE_15/etc/os-release
diff --git a/os_info/src/linux/tests/os-release-ubuntu → ...nfo/src/linux/tests/Ubuntu/etc/os-release b/os_info/src/linux/tests/os-release-ubuntu → ...nfo/src/linux/tests/Ubuntu/etc/os-release
diff --git a/os_info/src/linux/tests/none_invalid_os_release/etc/os-release b/os_info/src/linux/tests/none_invalid_os_release/etc/os-release
@@ -0,0 +1,2 @@
+ID="Lorem ipsum dolor sit amet"
+VERSION_ID="It's all greek to me"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ID="Lorem ipsum dolor sit amet"
		VERSION_ID="It's all greek to me"