Tests pass in python 3.6 and 3.9 in Linux

Modified failing tests to use the new defaulted .sconsign database based on the hash algorithm
For MD5, default database will be .sconsign.dblite
For other algorithms the default will be .sconsign_<hashname>.dblite.
For all cases where the user changes the hash algorithm used, the database will be .sconsign_<hashname>.dblite (including md5)
For sub-scons directories it remains as .sconsign
Also added unit-tests for Util.py for the new hash default changes.
It's difficult to setup a fips-compliant platform using containers, and instead we mock that.
option--config uses multiple types of hash algorithms so was skipped.
Removed one f-string (python 3.5 doesn't support those)
Corrupt.py is using an explicit .sconsign so that was left as-is, and only the parent default .sconsign was changed for work test 1.
A fetch-database name option was added to the testing framework.
The unlink_sconsignfile was not updated as no usages of it were found.

2 files changed, 46 insertions, 11 deletions

diff --git a/test/option/hash-format.py b/test/option/hash-format.py
index 9fa10ee..f0156f3 100644
--- a/test/option/hash-format.py
+++ b/test/option/hash-format.py
@@ -27,28 +27,52 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 import hashlib
 import os
 import TestSCons
+import warnings
+from SCons.Util import ALLOWED_HASH_FORMATS, DEFAULT_HASH_FORMATS
 
 # Test passing the hash format by command-line.
 INVALID_ALGORITHM = 'testfailure'
-for algorithm in ['md5', 'sha1', 'sha256', INVALID_ALGORITHM, None]:
+
+for algorithm in [*DEFAULT_HASH_FORMATS, INVALID_ALGORITHM, None]:
     test = TestSCons.TestSCons()
     test.dir_fixture('hash-format')
 
+    # Expect failure due to an unsupported/invalid algorithm.
+    # The error message however changes if SCons detects that the host system doesn't support one or more algorithms
+    # Primary reason the message changes is so user doesn't have to start with unsupported algorithm A and then attempt
+    # to switch to unsupported algorithm B.
+    # On normal systems (allowed=default) this will output a fixed message, but on FIPS-enabled or other weird systems
+    # that don't have default allowed algorithms, it informs the user of the mismatch _and_ the currently supported
+    # algorithms on the system they're using.
+    # In Python 3.9 this becomes somewhat obselete as the hashlib is informed we don't use hashing for security but
+    # for loose integrity.
     if algorithm == INVALID_ALGORITHM:
-        # Expect failure due to an unsupported/invalid algorithm.
-        test.run('--hash-format=%s .' % algorithm, stderr=r"""
-scons: \*\*\* Hash format "{}" is not supported by SCons. Only the following hash formats are supported: md5, sha1, sha256
+        if ALLOWED_HASH_FORMATS == DEFAULT_HASH_FORMATS:
+            test.run('--hash-format=%s .' % algorithm, stderr=r"""
+scons: \*\*\* Hash format "{}" is not supported by SCons. Only the following hash formats are supported: {}
+File "[^"]+", line \d+, in \S+
+""".format(algorithm, ', '.join(DEFAULT_HASH_FORMATS)), status=2, match=TestSCons.match_re)
+        else:
+            test.run('--hash-format=%s .' % algorithm, stderr=r"""
+scons: \*\*\* Hash format "{}" is not supported by SCons. SCons supports more hash formats than your local system is reporting; SCons supports: {}. Your local system only supports: {}
 File "[^"]+", line \d+, in \S+
-""".format(algorithm), status=2, match=TestSCons.match_re)
+""".format(algorithm, ', '.join(DEFAULT_HASH_FORMATS), ', '.join(ALLOWED_HASH_FORMATS)), status=2, match=TestSCons.match_re)
         continue
     elif algorithm is not None:
-        # Skip any algorithm that the Python interpreter doesn't have.
-        if hasattr(hashlib, algorithm):
+        if algorithm in ALLOWED_HASH_FORMATS:
             expected_dblite = test.workpath('.sconsign_%s.dblite' % algorithm)
             test.run('--hash-format=%s .' % algorithm)
         else:
-            print('Skipping test with --hash-format=%s because that '
-                  'algorithm is not available.' % algorithm)
+            test.run('--hash-format=%s' % algorithm, stderr=r"""
+scons: \*\*\* While hash format "{}" is supported by SCons, the local system indicates only the following hash formats are supported by the hashlib library: {}
+File "[^"]+", line \d+, in \S+
+Error in atexit._run_exitfuncs:
+Traceback \(most recent call last\):
+  File "[^"]+", line \d+, in \S+
+    assert csig == '[a-z0-9]+', csig
+AssertionError: [a-z0-9]+
+""".format(algorithm, ', '.join(ALLOWED_HASH_FORMATS)), status=2, match=TestSCons.match_re)
+            continue
     else:
         # The SConsign file in the hash-format folder has logic to call
         # SCons.Util.set_hash_format('sha256') if the default algorithm is
diff --git a/test/option/option-n.py b/test/option/option-n.py
index e647b8e..eb8eb62 100644
--- a/test/option/option-n.py
+++ b/test/option/option-n.py
@@ -43,6 +43,7 @@ import os
 import re
 
 import TestSCons
+from SCons.Util import get_current_hash_algorithm_used
 
 _python_ = TestSCons._python_
 
@@ -118,7 +119,7 @@ test.fail_test(not os.path.exists(test.workpath('f1.out')))
 expect = test.wrap_stdout("""\
 %(_python_)s build.py f1.out
 """ % locals())
-test.unlink('.sconsign.dblite')
+test.unlink(test.get_sconsignname()+'.dblite')
 test.write('f1.out', "X1.out\n")
 test.run(arguments='-n f1.out', stdout=expect)
 test.run(arguments='-n f1.out', stdout=expect)
@@ -204,13 +205,23 @@ test.run(arguments="-n", stderr=stderr, status=2,
 test.fail_test(os.path.exists(test.workpath("configure", "config.test")))
 test.fail_test(os.path.exists(test.workpath("configure", "config.log")))
 
+
+# depending on which default hash function we're using, we'd expect one of the following filenames.
+# The filenames are generated by the conftest changes in #3543 : https://github.com/SCons/scons/pull/3543/files
+possible_filenames = {
+    'md5': "conftest_b10a8db164e0754105b7a99be72e3fe5_0.in",
+    'sha1': "conftest_0a4d55a8d778e5022fab701977c5d840bbc486d0_0.in",
+    'sha256': "conftest_a591a6d40bf420404a011733cfb7b190d62c65bf0bcda32b57b277d9ad9f146e_0.in"
+}
+test_filename = possible_filenames[get_current_hash_algorithm_used()]
+
 # test that targets are not built, if conf_dir exists.
 # verify that .cache and config.log are not created.
 # an error should be raised
 stderr = r"""
 scons: \*\*\* Cannot update configure test "%s" within a dry-run\.
 File \S+, line \S+, in \S+
-""" % re.escape(os.path.join("config.test", "conftest_b10a8db164e0754105b7a99be72e3fe5_0.in"))
+""" % re.escape(os.path.join("config.test", test_filename))
 test.subdir(['configure', 'config.test'])
 test.run(arguments="-n", stderr=stderr, status=2,
          chdir=test.workpath("configure"))