Fixing slider issues identified:

The linter identified that warnings was unused in hash-format.py
The linter found that the skip_test function call was using 2 space indentation (not sure how I managed to do that).
Warning was originally added as hash-format gave a warning on ALLOWED_HASH_FORMATS != default
That was changed to instead test the different cases directly.
option--config.py skips the test if the default algorithm is not MD5 as the hashes used are OS-specific,
and supporting it in FIPS mode would be difficult. It's better to just skip this testcase in FIPS mode instead as
this specific test is different in that regard to the other FIPS-enabled tests.

2 files changed, 1 insertions, 2 deletions

diff --git a/test/Configure/option--config.py b/test/Configure/option--config.py
index 3b38892..3fd0691 100644
--- a/test/Configure/option--config.py
+++ b/test/Configure/option--config.py
@@ -46,7 +46,7 @@ CF = test.CF  # cached build failure
 # as this test is somewhat complicated, skip it if the library doesn't support md5
 # as the default hashing algorithm.
 if get_current_hash_algorithm_used() != 'md5':
-  test.skip_test('Skipping test as could not continue without the hash algorithm set to md5!')
+    test.skip_test('Skipping test as could not continue without the hash algorithm set to md5!')
 
 SConstruct_path = test.workpath('SConstruct')
 
diff --git a/test/option/hash-format.py b/test/option/hash-format.py
index f0156f3..663ad2e 100644
--- a/test/option/hash-format.py
+++ b/test/option/hash-format.py
@@ -27,7 +27,6 @@ __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.