From d8defdd7b039cb5f6b8e8b3f4cd2b0da8311c5dc Mon Sep 17 00:00:00 2001 From: Jason Ertel Date: Tue, 5 Apr 2022 07:36:25 -0400 Subject: [PATCH] Improve unit test stability --- salt/sensoroni/files/analyzers/helpers_test.py | 6 ++++-- salt/sensoroni/files/analyzers/urlhaus/urlhaus_test.py | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/salt/sensoroni/files/analyzers/helpers_test.py b/salt/sensoroni/files/analyzers/helpers_test.py index 3a5f99646..e60d31450 100644 --- a/salt/sensoroni/files/analyzers/helpers_test.py +++ b/salt/sensoroni/files/analyzers/helpers_test.py @@ -1,5 +1,6 @@ from unittest.mock import patch, MagicMock import helpers +import os import unittest @@ -14,10 +15,11 @@ class TestHelpersMethods(unittest.TestCase): result = helpers.checkSupportedType(meta, "bar") self.assertFalse(result) - mock.assert_called_once_with("No supported type detected!") + mock.assert_called_once_with(126) def test_loadMetadata(self): - input = 'urlhaus/urlhaus.py' + dir = os.path.dirname(os.path.realpath(__file__)) + input = dir + '/urlhaus/urlhaus.py' data = helpers.loadMetadata(input) self.assertEqual(data["name"], "Urlhaus") diff --git a/salt/sensoroni/files/analyzers/urlhaus/urlhaus_test.py b/salt/sensoroni/files/analyzers/urlhaus/urlhaus_test.py index 0bf175578..8a74a11ff 100644 --- a/salt/sensoroni/files/analyzers/urlhaus/urlhaus_test.py +++ b/salt/sensoroni/files/analyzers/urlhaus/urlhaus_test.py @@ -13,7 +13,7 @@ class TestUrlhausMethods(unittest.TestCase): urlhaus.main() expected = '{"foo": "bar"}\n' self.assertEqual(mock_stdout.getvalue(), expected) - mock.assert_called_once_with('.') + mock.assert_called_once() def test_buildReq(self): result = urlhaus.buildReq("test") @@ -31,14 +31,14 @@ class TestUrlhausMethods(unittest.TestCase): results = urlhaus.prepareResults(raw) self.assertEqual(results["response"], raw) self.assertEqual(results["summary"], "no_results") - self.assertEqual(results["status"], "info") + self.assertEqual(results["status"], "ok") def test_prepareResults_invalidUrl(self): raw = {"query_status": "invalid_url"} results = urlhaus.prepareResults(raw) self.assertEqual(results["response"], raw) self.assertEqual(results["summary"], "invalid_url") - self.assertEqual(results["status"], "error") + self.assertEqual(results["status"], "caution") def test_prepareResults_threat(self): raw = {"query_status": "invalid_url"} # This is overrided in this scenario @@ -46,7 +46,7 @@ class TestUrlhausMethods(unittest.TestCase): results = urlhaus.prepareResults(raw) self.assertEqual(results["response"], raw) self.assertEqual(results["summary"], "bad_actor") - self.assertEqual(results["status"], "danger") + self.assertEqual(results["status"], "threat") def test_analyze(self): output = {"threat": "malware_download"}