diff options
| author | ng0 <ng0@n0.is> | 2019-09-24 17:18:18 +0000 |
|---|---|---|
| committer | ng0 <ng0@n0.is> | 2019-09-24 17:18:18 +0000 |
| commit | 2f9384498f26f382452e41440dd0fa1f45935ea1 (patch) | |
| tree | c262aa054b003fecd6531ba676a2edf6b9f31ec7 /tests | |
| parent | d31af3f32d73a6da0633c30568fdf522ef53ca60 (diff) | |
| download | taler-util-2f9384498f26f382452e41440dd0fa1f45935ea1.tar.gz taler-util-2f9384498f26f382452e41440dd0fa1f45935ea1.tar.bz2 taler-util-2f9384498f26f382452e41440dd0fa1f45935ea1.zip | |
use assertIsNone method for tests, introduced in 3.1
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/log_test.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tests/log_test.py b/tests/log_test.py index 098dc53..268e176 100755 --- a/tests/log_test.py +++ b/tests/log_test.py @@ -104,8 +104,8 @@ class TestGnunetLog(TestCase): @patch("logging.basicConfig") def test_no_env_and_no_setup(self, mocked_basicConfig, mocked_setLevel): # Double-check no env variable gets in the way. - assert None == os.environ.get("GNUNET_FORCE_LOG") - assert None == os.environ.get("GNUNET_LOG") + self.assertIsNone(os.environ.get("GNUNET_FORCE_LOG")) + self.assertIsNone(os.environ.get("GNUNET_LOG")) gl = GL("gnunet-pylog") gl.log("msg", gl.DEBUG) mocked_setLevel.assert_called_with(level=logging.INFO) @@ -124,7 +124,7 @@ class TestGnunetLog(TestCase): @patch("logging.Logger.setLevel") @patch("logging.basicConfig") def test_non_forced_env(self, mocked_basicConfig, mocked_setLevel): - assert None == os.environ.get("GNUNET_FORCE_LOG") + self.assertIsNone(os.environ.get("GNUNET_FORCE_LOG")) os.environ["GNUNET_LOG"] = "gnunet-pylog;log_test.py;test_non_forced_env;99;ERROR" # lineno is not 100% accurate. gl = GL("gnunet-pylog") gl.log("msg", gl.DEBUG) @@ -143,7 +143,7 @@ class TestGnunetLog(TestCase): @patch("logging.Logger.setLevel") @patch("logging.basicConfig") def test_only_forced_env(self, mocked_basicConfig, mocked_setLevel): - assert None == os.environ.get("GNUNET_LOG") + self.assertIsNone(os.environ.get("GNUNET_LOG")) os.environ["GNUNET_FORCE_LOG"] = "gnunet-pylog;log_test.py;test_only_forced_env;90-200;ERROR" gl = GL("gnunet-pylog") gl.log("msg", gl.DEBUG) @@ -161,8 +161,8 @@ class TestGnunetLog(TestCase): @patch("logging.Logger.setLevel") @patch("logging.basicConfig") def test_only_manual_loglevel_setup(self, mocked_basicConfig, mocked_setLevel): - assert None == os.environ.get("GNUNET_LOG") - assert None == os.environ.get("GNUNET_FORCE_LOG") + self.assertIsNone(os.environ.get("GNUNET_LOG")) + self.assertIsNone(os.environ.get("GNUNET_FORCE_LOG")) gl = GL("gnunet-pylog") gl.setup(gl.ERROR) gl.log("msg", gl.DEBUG) @@ -182,8 +182,8 @@ class TestGnunetLog(TestCase): @patch("logging.Logger.setLevel") @patch("logging.basicConfig") def test_manual_loglevel_AND_forced_env(self, mocked_basicConfig, mocked_setLevel): - assert None == os.environ.get("GNUNET_LOG") - assert None == os.environ.get("GNUNET_FORCE_LOG") + self.assertIsNone(os.environ.get("GNUNET_LOG")) + self.assertIsNone(os.environ.get("GNUNET_FORCE_LOG")) # forced env definition (*before* object creation) os.environ["GNUNET_FORCE_LOG"] = ";;;;ERROR" @@ -208,8 +208,8 @@ class TestGnunetLog(TestCase): @patch("logging.Logger.setLevel") @patch("logging.basicConfig") def test_manual_loglevel_AND_nonforced_env(self, mocked_basicConfig, mocked_setLevel): - assert None == os.environ.get("GNUNET_LOG") - assert None == os.environ.get("GNUNET_FORCE_LOG") + self.assertIsNone(os.environ.get("GNUNET_LOG")) + self.assertIsNone(os.environ.get("GNUNET_FORCE_LOG")) os.environ["GNUNET_LOG"] = ";;;;DEBUG" gl = GL("gnunet-pylog") gl.setup(gl.ERROR) @@ -229,8 +229,8 @@ class TestGnunetLog(TestCase): @patch("logging.Logger.setLevel") @patch("logging.basicConfig") def test_forced_env_AND_nonforced_env(self, mocked_basicConfig, mocked_setLevel): - assert None == os.environ.get("GNUNET_LOG") - assert None == os.environ.get("GNUNET_FORCE_LOG") + self.assertIsNone(os.environ.get("GNUNET_LOG")) + self.assertIsNone(os.environ.get("GNUNET_FORCE_LOG")) os.environ["GNUNET_LOG"] = ";;;;DEBUG" os.environ["GNUNET_FORCE_LOG"] = ";;;;ERROR" gl = GL("gnunet-pylog") |