Merge pull request #66 from uclahs-cds/nwiltsie-fix-tests

Resolve non-determinism with NFTestENV tests

CHANGELOG.md

@@ -19,6 +19,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ### Fixed
 - Make `nftest` with no arguments print usage and exit
+- Resolve non-determinism in NFTestENV unit tests
 
 ---
 

test/unit/test_NFTestAssert.py

@@ -12,6 +12,9 @@
 @mock.patch("nftest.NFTestAssert.NFTestAssert", wraps=NFTestAssert)
 def test_get_assert_method_value_error(mock_assert):
     """Tests value error from get_assert_method when given `method` is not supported"""
+    # Make an NFTestAssert object
+    NFTestAssert("", "")
+
     assert_method = "nomethod"
     mock_assert.return_value.script = None
     mock_assert.return_value.method = assert_method

test/unit/test_NFTestEnv.py

@@ -17,8 +17,12 @@ def test_nftest_env_load(monkeypatch):
     monkeypatch.setenv("NFT_LOG_LEVEL", test_log_level)
     monkeypatch.setenv("NFT_LOG", test_log_file)
 
+    # Clear any existing singleton value
+    NFTestENV._instances.pop(NFTestENV, None)   # pylint: disable=protected-access
     nftest_env = NFTestENV()
 
+    assert NFTestENV in NFTestENV._instances    # pylint: disable=protected-access
+
     assert nftest_env.NFT_OUTPUT == test_out_directory
     assert nftest_env.NFT_TEMP == test_temp_directory
     assert nftest_env.NFT_INIT == test_init_directory
@@ -32,3 +36,8 @@ def test_singleton():
     nftest_env2 = NFTestENV()
 
     assert id(nftest_env1) == id(nftest_env2)
+
+    NFTestENV._instances.pop(NFTestENV, None)   # pylint: disable=protected-access
+    nftest_env3 = NFTestENV()
+
+    assert id(nftest_env1) != id(nftest_env3)