add test case for binary support

Author: Yi He

src/lib/greenboot.rs

@@ -130,13 +130,13 @@ fn run_scripts(name: &str, path: &str, disabled_scripts: Option<&[String]>) -> S
     };
 
     for entry in entries.flatten() {
-        // Process script name
+        // Process script/binary name
         let file_name = match entry.file_name().and_then(|n| n.to_str()) {
             Some(name) => name,
             None => continue,
         };
 
-        // Check if script should be skipped
+        // Check if script/binary should be skipped
         if let Some(disabled) = disabled_scripts {
             if disabled.contains(&file_name.to_string()) {
                 log::info!("Skipping disabled script: {}", file_name);
@@ -147,7 +147,7 @@ fn run_scripts(name: &str, path: &str, disabled_scripts: Option<&[String]>) -> S
 
         log::info!("running {} check {}", name, entry.to_string_lossy());
 
-        // Sort between script and binary since they require different commands to execute properly.
+        // Sort between scripts and binaries since they require different commands to execute properly.
         let output = if entry.extension().and_then(|ext| ext.to_str()) == Some("sh") {
             Command::new("bash").arg("-C").arg(&entry).output()
         } else {
@@ -233,8 +233,8 @@ mod test {
         setup_folder_structure(false)
             .context("Test setup failed")
             .unwrap();
-        // Causes errors if these are no removed since they cause an excess amount
-        // of failure.
+        // Causes errors if these are not removed since they cause an excess amount
+        // of failures.
         let required_path = format!("{}/check/required.d", GREENBOOT_INSTALL_PATHS[1]);
         let _ = std::fs::remove_file(format!("{}/01_failing_binary", required_path));
         let _ = std::fs::remove_file(format!("{}/02_failing_binary", required_path));

tests/greenboot-bootc-anaconda-iso.sh

@@ -150,7 +150,9 @@ fi
 greenprint "Building greenboot packages"
 pushd .. && \
 make rpm
-cp rpmbuild/RPMS/x86_64/*.rpm tests/ && popd
+cp rpmbuild/RPMS/x86_64/*.rpm tests/
+cp testing_assets/passing_binary tests/
+cp testing_assets/failing_binary tests/ && popd
 
 ###########################################################
 ##
@@ -169,6 +171,8 @@ RUN dnf install -y \
     systemctl enable greenboot-healthcheck.service greenboot-rollback.service greenboot-success.target
 RUN sed -i "s/GREENBOOT_MAX_BOOT_ATTEMPTS=3/GREENBOOT_MAX_BOOT_ATTEMPTS=5/g" /etc/greenboot/greenboot.conf
 RUN sed -i 's#DISABLED_HEALTHCHECKS=()#DISABLED_HEALTHCHECKS=("01_repository_dns_check.sh" "not_exit.sh")#g' /etc/greenboot/greenboot.conf
+COPY passing_binary /etc/greenboot/check/required.d/
+COPY failing_binary /etc/greenboot/check/wanted.d/
 # Clean up by removing the local RPMs if desired
 RUN rm -f /tmp/greenboot-*.rpm
 EOF

tests/greenboot-bootc-qcow2.sh

@@ -150,7 +150,9 @@ fi
 greenprint "Building greenboot packages"
 pushd .. && \
 make rpm
-cp rpmbuild/RPMS/x86_64/*.rpm tests/ && popd
+cp rpmbuild/RPMS/x86_64/*.rpm tests/
+cp testing_assets/passing_binary tests/
+cp testing_assets/failing_binary tests/ && popd
 
 ###########################################################
 ##
@@ -169,6 +171,8 @@ RUN dnf install -y \
     systemctl enable greenboot-healthcheck.service greenboot-rollback.service greenboot-success.target
 RUN sed -i "s/GREENBOOT_MAX_BOOT_ATTEMPTS=3/GREENBOOT_MAX_BOOT_ATTEMPTS=5/g" /etc/greenboot/greenboot.conf
 RUN sed -i 's#DISABLED_HEALTHCHECKS=()#DISABLED_HEALTHCHECKS=("01_repository_dns_check.sh" "not_exit.sh")#g' /etc/greenboot/greenboot.conf
+COPY passing_binary /etc/greenboot/check/required.d/
+COPY failing_binary /etc/greenboot/check/wanted.d/
 # Clean up by removing the local RPMs if desired
 RUN rm -f /tmp/greenboot-*.rpm
 EOF

tests/greenboot-bootc.yaml

@@ -164,6 +164,29 @@
           set_fact:
             failed_counter: "{{ failed_counter | int + 1 }}"
 
+    # case: check binary file support
+    - name: check binary file support
+      block:
+        - name: binary file check result should be found here
+          shell: journalctl -b -0 -u greenboot -u greenboot-healthcheck
+          become: yes
+          register: result_binary
+
+        - assert:
+            that:
+              - "'required script /etc/greenboot/check/required.d/passing_binary success!' in result_binary.stdout"
+              - "'wanted script /etc/greenboot/check/wanted.d/failing_binary failed!' in result_binary.stdout"
+            fail_msg: "Binary file check log not found"
+            success_msg: "Found binary file check log"
+
+      always:
+        - set_fact:
+            total_counter: "{{ total_counter | int + 1 }}"
+      rescue:
+        - name: failed count + 1
+          set_fact:
+            failed_counter: "{{ failed_counter | int + 1 }}"
+
     # case: check boot times
     - name: check boot times
       block: