diff options
| author | Jacob Cassagnol <87133045+jcassagnol-public@users.noreply.github.com> | 2021-11-02 23:04:36 (GMT) |
|---|---|---|
| committer | Jacob Cassagnol <87133045+jcassagnol-public@users.noreply.github.com> | 2021-11-02 23:04:36 (GMT) |
| commit | 188d6f8a500508693c3f7215c4d553ae35cadac6 (patch) | |
| tree | b24cbc72c95c7e5f3f8133f1e2876dc8e14c6d7a /SCons/Node | |
| parent | a1ef39ffa7099f800d5e8f31361dd59770c68b27 (diff) | |
| download | SCons-188d6f8a500508693c3f7215c4d553ae35cadac6.zip SCons-188d6f8a500508693c3f7215c4d553ae35cadac6.tar.gz SCons-188d6f8a500508693c3f7215c4d553ae35cadac6.tar.bz2 | |
Passes tests in >= python 3.9
Refactored code to match PR requirements
Changed result ==... result== to result in(...)
Updated the man page to reference the defaulting behavior for FIPS machines.
Updated a typo and design of change in the CHANGES.txt file
Made an ugly bit of code in Util.py that fixes it so python3.9 has MD5 support enabled in FIPS mode.
The code is much more ugly than before, with the tradeoff being it's testable and usable.
In python >= 3.9, SCons will now always default to MD5.
Next commit will work on getting the tests to auto-skip the md5-required steps on versions <= python 3.8.
Diffstat (limited to 'SCons/Node')
| -rw-r--r-- | SCons/Node/NodeTests.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/SCons/Node/NodeTests.py b/SCons/Node/NodeTests.py index 2677aa9..b36c2e9 100644 --- a/SCons/Node/NodeTests.py +++ b/SCons/Node/NodeTests.py @@ -592,7 +592,7 @@ class NodeTestCase(unittest.TestCase): node = SCons.Node.Node() node._func_get_contents = 4 result = node.get_csig() - assert result == '550a141f12de6341fba65b0ad0433500' or result == '9a3e61b6bcc8abec08f195526c3132d5a4a98cc0' or result == '3538a1ef2e113da64249eea7bd068b585ec7ce5df73b2d1e319d8c9bf47eb314', result + assert result in ('550a141f12de6341fba65b0ad0433500', '9a3e61b6bcc8abec08f195526c3132d5a4a98cc0', '3538a1ef2e113da64249eea7bd068b585ec7ce5df73b2d1e319d8c9bf47eb314'), result finally: SCons.Node.Node.NodeInfo = SCons.Node.NodeInfoBase @@ -609,7 +609,7 @@ class NodeTestCase(unittest.TestCase): node = SCons.Node.Node() node._func_get_contents = 4 result = node.get_cachedir_csig() - assert result == '15de21c670ae7c3f6f3f1f37029303c9' or result == 'cfa1150f1787186742a9a884b73a43d8cf219f9b' or result == '91a73fd806ab2c005c13b4dc19130a884e909dea3f72d46e30266fe1a1f588d8', result + assert result in ('15de21c670ae7c3f6f3f1f37029303c9', 'cfa1150f1787186742a9a884b73a43d8cf219f9b', '91a73fd806ab2c005c13b4dc19130a884e909dea3f72d46e30266fe1a1f588d8'), result finally: SCons.Node.Node.NodeInfo = SCons.Node.NodeInfoBase |