Merge pull request #1 from pareid/master

Changes to allow CI build in Azure DevOps

Author: pareid

msticpy/tests/__init__.py tests/__init__.pymsticpy/tests/__init__.py renamed to tests/__init__.py

@@ -9,14 +9,14 @@
 from os import path
 import pandas as pd
 
-from .. sectools import base64unpack as b64
+from .. msticpy.sectools import base64unpack as b64
 
 
-_test_data_folders = [d for d, _, _ in os.walk(os.getcwd()) if d.endswith('\\tests\\testdata')]
+_test_data_folders = [d for d, _, _ in os.walk(os.getcwd()) if d.endswith('/tests/testdata')]
 if len(_test_data_folders) == 1:
     _TEST_DATA = _test_data_folders[0]
 else:
-    _TEST_DATA = '.\\tests\\testdata'
+    _TEST_DATA = './tests/testdata'
 
 
 class TestB64Unpack(unittest.TestCase):

msticpy/tests/test_b64unpack.py tests/test_b64unpack.pymsticpy/tests/test_b64unpack.py renamed to tests/test_b64unpack.py

@@ -4,7 +4,7 @@
 import pandas as pd
 
 # Test code
-from .. sectools.iocextract import IoCExtract
+from .. msticpy.sectools.iocextract import IoCExtract
 
 TEST_CASES = {
     'ipv4_test': r'c:\one\path\or\another\myprocess -ip4:206.123.1.123',

msticpy/tests/test_ioc_extractor.py tests/test_ioc_extractor.pymsticpy/tests/test_ioc_extractor.py renamed to tests/test_ioc_extractor.py

@@ -10,7 +10,7 @@
 # from .. nbtools import query_builtin_queries as queries
 # from .. nbtools.query_mgr import replace_query_params, add_query
 # from .. nbtools.query_defns import DataFamily, DataEnvironment, KqlQuery
-from .. nbtools.entityschema import Entity, Account, Host, Process, File, IpAddress
+from .. msticpy.nbtools.entityschema import Entity, Account, Host, Process, File, IpAddress
 
 
 class Testnbtools(unittest.TestCase):

msticpy/tests/test_kql_magic.py tests/test_kql_magic.pymsticpy/tests/test_kql_magic.py renamed to tests/test_kql_magic.py

@@ -7,10 +7,10 @@
 import unittest
 from datetime import datetime
 
-from .. nbtools import query_builtin_queries as queries
-from .. nbtools import kql
-from .. nbtools.query_mgr import replace_query_params, add_query, required_params
-from .. nbtools.query_defns import DataFamily, DataEnvironment, KqlQuery, QueryParamProvider
+from .. msticpy.nbtools import query_builtin_queries as queries
+from .. msticpy.nbtools import kql
+from .. msticpy.nbtools.query_mgr import replace_query_params, add_query, required_params
+from .. msticpy.nbtools.query_defns import DataFamily, DataEnvironment, KqlQuery, QueryParamProvider
 
 
 class QPTest(QueryParamProvider):

msticpy/tests/test_nb_tools.py tests/test_nb_tools.pymsticpy/tests/test_nb_tools.py renamed to tests/test_nb_tools.py

@@ -6,8 +6,8 @@
 """query_schema test class."""
 import unittest
 
-from .. nbtools.query_schema import DataSchema
-from .. nbtools.query_defns import DataFamily, DataEnvironment
+from .. msticpy.nbtools.query_schema import DataSchema
+from .. msticpy.nbtools.query_defns import DataFamily, DataEnvironment
 
 
 class TestQuerySchema(unittest.TestCase):

msticpy/tests/test_query_mgr.py tests/test_query_mgr.pymsticpy/tests/test_query_mgr.py renamed to tests/test_query_mgr.py

@@ -8,10 +8,10 @@
 import unittest
 import pandas as pd
 
-from .. nbtools import SecurityAlert
-from .. nbtools.security_alert_graph import create_alert_graph
-from .. nbtools.nbdisplay import display_alert
-from .. nbtools.query_defns import DataFamily, DataEnvironment
+from .. msticpy.nbtools import SecurityAlert
+from .. msticpy.nbtools.security_alert_graph import create_alert_graph
+from .. msticpy.nbtools.nbdisplay import display_alert
+from .. msticpy.nbtools.query_defns import DataFamily, DataEnvironment
 
 
 sample_alert = {

msticpy/tests/test_query_schema.py tests/test_query_schema.pymsticpy/tests/test_query_schema.py renamed to tests/test_query_schema.py

@@ -9,13 +9,13 @@
 from os import path
 
 import pandas as pd
-from .. sectools.vtlookup import VTLookup
+from .. msticpy.sectools.vtlookup import VTLookup
 
-_test_data_folders = [d for d, _, _ in os.walk(os.getcwd()) if d.endswith('\\tests\\testdata')]
+_test_data_folders = [d for d, _, _ in os.walk(os.getcwd()) if d.endswith('/tests/testdata')]
 if len(_test_data_folders) == 1:
     _TEST_DATA = _test_data_folders[0]
 else:
-    _TEST_DATA = '.\\tests\\testdata'
+    _TEST_DATA = './tests/testdata'
 
 
 class TestVTLookup(unittest.TestCase):
@@ -198,4 +198,4 @@ def test_parse_ip_results(self):
 
 if __name__ == '__main__':
     unittest.main()
-    print('bye')
+    print('bye')