diff options
| -rw-r--r-- | sos/component.py | 2 | ||||
| -rw-r--r-- | tests/cleaner_tests.py | 97 | ||||
| -rwxr-xr-x | tests/simple.sh | 1 |
3 files changed, 99 insertions, 1 deletions
diff --git a/sos/component.py b/sos/component.py index 8b70ce34..7787fe08 100644 --- a/sos/component.py +++ b/sos/component.py @@ -14,7 +14,6 @@ import logging import os import tempfile import sys -import sos.policies from argparse import SUPPRESS from datetime import datetime @@ -105,6 +104,7 @@ class SoSComponent(): if self.load_policy: try: + import sos.policies self.policy = sos.policies.load(sysroot=self.opts.sysroot) except KeyboardInterrupt: self._exit(0) diff --git a/tests/cleaner_tests.py b/tests/cleaner_tests.py new file mode 100644 index 00000000..0c6ac589 --- /dev/null +++ b/tests/cleaner_tests.py @@ -0,0 +1,97 @@ +# This file is part of the sos project: https://github.com/sosreport/sos +# +# This copyrighted material is made available to anyone wishing to use, +# modify, copy, or redistribute it subject to the terms and conditions of +# version 2 of the GNU General Public License. +# +# See the LICENSE file in the source distribution for further information. + +import unittest + +from ipaddress import ip_interface +from sos.cleaner.parsers.ip_parser import SoSIPParser +from sos.cleaner.parsers.mac_parser import SoSMacParser +from sos.cleaner.mappings.ip_map import SoSIPMap +from sos.cleaner.mappings.mac_map import SoSMacMap + + +class CleanerMapTests(unittest.TestCase): + + def setUp(self): + self.mac_map = SoSMacMap() + self.ip_map = SoSIPMap() + + def test_mac_map_obfuscate_valid_v4(self): + _test = self.mac_map.get('12:34:56:78:90:ab') + self.assertNotEqual(_test, '12:34:56:78:90:ab') + + def test_mac_map_obfuscate_valid_v6(self): + _test = self.mac_map.get('12:34:56:ff:fe:78:90:ab') + self.assertNotEqual(_test, '12:34:56:ff:fe:78:90:ab') + + def test_mac_map_obfuscate_valid_v6_quad(self): + _test = self.mac_map.get('1234:56ff:fe78:90ab') + self.assertNotEqual(_test, '1234:56ff:fe78:90ab') + + def test_mac_map_skip_ignores(self): + _test = self.mac_map.get('ff:ff:ff:ff:ff:ff') + self.assertEquals(_test, 'ff:ff:ff:ff:ff:ff') + + def test_mac_map_avoid_duplicate_obfuscation(self): + _test = self.mac_map.get('ab:cd:ef:fe:dc:ba') + _dup = self.mac_map.get(_test) + self.assertEquals(_test, _dup) + + def test_ip_map_obfuscate_v4_with_cidr(self): + _test = self.ip_map.get('192.168.1.0/24') + self.assertNotEqual(_test, '192.168.1.0/24') + + def test_ip_map_obfuscate_no_cidr(self): + _test = self.ip_map.get('192.168.2.2') + self.assertNotEqual(_test, '192.168.2.2') + + def test_ip_map_obfuscate_same_subnet(self): + _net = ip_interface(self.ip_map.get('192.168.3.0/24')) + _test = ip_interface(self.ip_map.get('192.168.3.1')) + self.assertTrue(_test.ip in _net.network) + + def test_ip_map_get_same_with_or_without_cidr(self): + _net = self.ip_map.get('192.168.4.0/24') + _hostwsub = self.ip_map.get('192.168.4.1/24') + _hostnosub = self.ip_map.get('192.168.4.1') + self.assertEqual(_hostwsub.split('/')[0], _hostnosub) + + def test_ip_skip_ignores(self): + _test = self.ip_map.get('127.0.0.1') + self.assertEquals(_test, '127.0.0.1') + + +class CleanerParserTests(unittest.TestCase): + + def setUp(self): + self.ip_parser = SoSIPParser() + self.mac_parser = SoSMacParser() + + def test_ip_parser_valid_ipv4_line(self): + line = 'foobar foo 10.0.0.1/24 barfoo bar' + _test = self.ip_parser.parse_line(line)[0] + self.assertNotEqual(line, _test) + + def test_ip_parser_invalid_ipv4_line(self): + line = 'foobar foo 10.1.2.350 barfoo bar' + self.assertRaises(ValueError, self.ip_parser.parse_line, line) + + def test_ip_parser_package_version_line(self): + line = 'mycoolpackage-1.2.3.4.5' + _test = self.ip_parser.parse_line(line)[0] + self.assertEqual(line, _test) + + def test_mac_parser_valid_ipv4_line(self): + line = 'foobar foo 13:24:35:46:57:68 bar barfoo' + _test = self.mac_parser.parse_line(line)[0] + self.assertNotEqual(line, _test) + + def test_mac_parser_valid_ipv6_line(self): + line = 'foobar foo AA:BB:CC:FF:FE:DD:EE:FF bar barfoo' + _test = self.mac_parser.parse_line(line)[0] + self.assertNotEqual(line, _test) diff --git a/tests/simple.sh b/tests/simple.sh index 08f1c051..a759a106 100755 --- a/tests/simple.sh +++ b/tests/simple.sh @@ -107,6 +107,7 @@ run_expecting_sucess " --batch -t 1 -n hardware" extract run_expecting_sucess " --batch --quiet -e opencl -k kernel.with-timer" extract run_expecting_sucess " --batch --case-id 10101 --all-logs --since=$(date -d "yesterday 13:00" '+%Y%m%d') " extract run_expecting_sucess " --batch --verbose --no-postproc" extract +run_expecting_sucess " --batch --mask" extract echo $summary |