Merge pull request #4492 from branfosj/bash

switch from `ls` to `bash` in tests that are expecting this to be a binary

Author: boegel

test/framework/filetools.py

@@ -924,7 +924,7 @@ def test_is_binary(self):
 
         self.assertTrue(ft.is_binary(b'\00'))
         self.assertTrue(ft.is_binary(b"File is binary when it includes \00 somewhere"))
-        self.assertTrue(ft.is_binary(ft.read_file('/bin/ls', mode='rb')))
+        self.assertTrue(ft.is_binary(ft.read_file('/bin/bash', mode='rb')))
 
     def test_det_patched_files(self):
         """Test det_patched_files function."""

test/framework/systemtools.py

@@ -1033,15 +1033,15 @@ def test_check_linked_shared_libs(self):
         self.assertEqual(check_linked_shared_libs(txt_path), None)
         self.assertEqual(check_linked_shared_libs(broken_symlink_path), None)
 
-        bin_ls_path = which('ls')
+        bin_bash_path = which('bash')
 
         os_type = get_os_type()
         if os_type == LINUX:
             with self.mocked_stdout_stderr():
-                res = run_shell_cmd("ldd %s" % bin_ls_path)
+                res = run_shell_cmd("ldd %s" % bin_bash_path)
         elif os_type == DARWIN:
             with self.mocked_stdout_stderr():
-                res = run_shell_cmd("otool -L %s" % bin_ls_path)
+                res = run_shell_cmd("otool -L %s" % bin_bash_path)
         else:
             raise EasyBuildError("Unknown OS type: %s" % os_type)
 
@@ -1061,7 +1061,7 @@ def test_check_linked_shared_libs(self):
             self.assertEqual(check_linked_shared_libs(self.test_prefix, **pattern_named_args), None)
             self.assertEqual(check_linked_shared_libs(txt_path, **pattern_named_args), None)
             self.assertEqual(check_linked_shared_libs(broken_symlink_path, **pattern_named_args), None)
-            for path in (bin_ls_path, lib_path):
+            for path in (bin_bash_path, lib_path):
                 # path may not exist, especially for library paths obtained via 'otool -L' on macOS
                 if os.path.exists(path):
                     error_msg = "Check on linked libs should pass for %s with %s" % (path, pattern_named_args)
@@ -1078,7 +1078,7 @@ def test_check_linked_shared_libs(self):
             self.assertEqual(check_linked_shared_libs(self.test_prefix, **pattern_named_args), None)
             self.assertEqual(check_linked_shared_libs(txt_path, **pattern_named_args), None)
             self.assertEqual(check_linked_shared_libs(broken_symlink_path, **pattern_named_args), None)
-            for path in (bin_ls_path, lib_path):
+            for path in (bin_bash_path, lib_path):
                 error_msg = "Check on linked libs should fail for %s with %s" % (path, pattern_named_args)
                 self.assertFalse(check_linked_shared_libs(path, **pattern_named_args), error_msg)