Added test for os minor version

Signed-off-by: Victor Moene <victor.moene@northern.tech>

Author: victormlg

libenv/sysinfo.c

@@ -3814,15 +3814,11 @@ static void OSVersionMinorPut(EvalContext *ctx, const char *minor)
 
 static void SysOSVersionMinor(EvalContext *ctx)
 {
-    #ifndef __MINGW32__
+#ifndef __MINGW32__
 
     const char *version_id = OSReleaseGet(ctx, "VERSION_ID");
     const char *name = OSReleaseGet(ctx, "NAME");
-    if (version_id == NULL)
-    {
-        return OSVersionMinorPut(ctx, NULL);
-    }
-    if (name == NULL)
+    if ((version_id == NULL) || (name == NULL))
     {
         return OSVersionMinorPut(ctx, NULL);
     }
@@ -3831,7 +3827,7 @@ static void SysOSVersionMinor(EvalContext *ctx)
     {
         return OSVersionMinorPut(ctx, NULL);
     }
-    if (name != NULL && (StringStartsWith(name, "solaris") || StringStartsWith(name, "sunos")))
+    if (StringStartsWith(name, "solaris") || StringStartsWith(name, "sunos"))
     {
         OSVersionMinorPut(ctx, version_tuple->name);
         return DeleteItemList(version_tuple);
@@ -3844,7 +3840,7 @@ static void SysOSVersionMinor(EvalContext *ctx)
     OSVersionMinorPut(ctx, version_tuple->next->name);
     return DeleteItemList(version_tuple);
 
-    #else
+#else
 
     char *release = SafeStringDuplicate(VSYSNAME.release);
     char *major = NULL;
@@ -3869,7 +3865,7 @@ static void SysOSVersionMinor(EvalContext *ctx)
                                 "source=agent");
     free(release);
 
-    #endif
+#endif
 }
 
 

tests/acceptance/01_vars/01_basic/os_version_minor.cf

@@ -0,0 +1,74 @@
+body common control
+{
+  bundlesequence => { "test", "check" };
+}
+
+bundle agent test
+{
+
+  vars:
+    # Platforms to test
+    any::
+      "platforms"
+        slist => { "debian", "ubuntu", "redhat", "rhel", "centos", "fedora",
+                   "aix", "hpux", "suse", "opensuse", "opensuse_leap", "sles",
+                   "solaris", "sunos", "windows", "freebsd", "macos" };
+
+
+    # Regex matching current platforms OS-class with version numbers
+    !solaris&!sunos::
+      "class_regex"
+        string => format("^(%s)_[0-9]+_[0-9]+$", join("|", "platforms"));
+    solaris|sunos::
+      "class_regex"
+        string => format("^(%s)_[0-9]+$", join("|", "platforms"));
+
+    # Regex to extract minor version number from OS-class
+    # Edge cases:
+    #  - On Solaris/SunOS minor version comes second
+    #    E.g. Solaris 11 has class "solaris_5_11"
+    any::
+      "extract_regex"
+        string => ifelse("solaris|sunos", "^[a-z]+_([0-9]+)$",
+                         "opensuse_leap", "^[a-z_]+_[0-9]+_([0-9]+$)",
+                                          "^[a-z]+_[0-9]+_([0-9]+$)");
+
+    # Find OS-class with version numbers using regex
+    any::
+      "os_class"
+        string => nth(classesmatching("$(class_regex)"), "0");
+
+    # Get extracted minor version number
+    any::
+      "expected"
+        string => nth("version_number", "1");
+
+  classes:
+    any::
+      "regextract_success"
+        expression => regextract("$(extract_regex)", "$(os_class)", "version_number");
+}
+
+bundle agent check
+{
+  vars:
+    any::
+      "defined_classes"
+        slist => classesmatching(".*");
+
+  classes:
+    any::
+      "passed"
+        expression => strcmp("$(test.expected)", "$(sys.os_version_minor)");
+
+  reports:
+    DEBUG::
+      "Version number extracted from class: $(test.os_class)";
+      "Defined classes: $(defined_classes)";
+      "$(this.promise_filename) Expected: $(test.expected)";
+      "$(this.promise_filename) Found: $(sys.os_version_minor)";
+    passed::
+      "$(this.promise_filename) Pass";
+    !passed::
+      "$(this.promise_filename) FAIL";
+}