updating tests for travis ci

Author: securityclippy

tests/test_feeds.py

@@ -3,21 +3,21 @@
 import os
 
 def  test_feeds_have_name():
-    for i in os.listdir("../feeds.d"):
+    for i in os.listdir("feeds.d"):
         if i.endswith(".json"):
-            with open("../feeds.d/{}".format(i), "r") as infile:
+            with open("feeds.d/{}".format(i), "r") as infile:
                 data = json.load(infile)
             for feed in data['feeds']:
                 assert len(feed['feed_name']) >= 1
 
 def test_feeds_have_type():
-    for i in os.listdir("../feeds.d"):
+    for i in os.listdir("feeds.d"):
         if i.endswith(".json"):
-            with open("../feeds.d/{}".format(i), "r") as infile:
+            with open("feeds.d/{}".format(i), "r") as infile:
                 data = json.load(infile)
             for feed in data['feeds']:
                 print(feed['feed_name'])
-                print("../feeds.d/{}".format(i))
+                print("feeds.d/{}".format(i))
                 if feed['feed_type'] == 'txt' or feed['feed_type'] == 'csv':
                     is_txt_or_csv = True
                 else:
@@ -26,9 +26,9 @@ def test_feeds_have_type():
 
 def test_csv_feeds():
     csv_feeds = []
-    for i in os.listdir("../feeds.d"):
+    for i in os.listdir("feeds.d"):
         if i.endswith(".json"):
-            with open("../feeds.d/{}".format(i), "r") as infile:
+            with open("feeds.d/{}".format(i), "r") as infile:
                 data = json.load(infile)
             for feed in data['feeds']:
                 if feed['feed_type'] == "csv":
@@ -49,9 +49,9 @@ def test_csv_feeds():
 
 def test_txt_feeds():
     txt_feeds = []
-    for i in os.listdir("../feeds.d"):
+    for i in os.listdir("feeds.d"):
         if i.endswith(".json"):
-            with open("../feeds.d/{}".format(i), "r") as infile:
+            with open("feeds.d/{}".format(i), "r") as infile:
                 data = json.load(infile)
             for feed in data['feeds']:
                 if feed['feed_type'] == "txt":

tests/test_ioc_parser.py

@@ -1,32 +1,33 @@
+'''
+IOC parser tests
+'''
 import pytest
 import json
 import pandas
-#from elasticintel.ingest_feed_lambda.ioc_feed_parser import IOCFeedParser
 from ingest_feed_lambda.ioc_feed_parser import IOCFeedParser
-#from ingest_feed_lambda.ioc_feed_parser import IOCFeedParser
 
 @pytest.fixture
 def txt_feed_dict():
-    with open("test_feeds/txt_feed.json", "r") as infile:
+    with open("tests/test_feeds/txt_feed.json", "r") as infile:
         feed = json.load(infile)
     return feed
 
 @pytest.fixture
 def txt_feed_data():
-    with open("test_feeds/test_txt_data.txt", "r") as infile:
+    with open("tests/test_feeds/test_txt_data.txt", "r") as infile:
         feed_data = infile.read()
     return feed_data
 
 
 @pytest.fixture
 def csv_feed_dict():
-    with open("test_feeds/csv_feed.json", "r") as infile:
+    with open("tests/test_feeds/csv_feed.json", "r") as infile:
         feed = json.load(infile)
     return feed
 
 @pytest.fixture
 def csv_test_data():
-    with open("test_feeds/test_csv_data.txt", "r") as infile:
+    with open("tests/test_feeds/test_csv_data.txt", "r") as infile:
         feed_data = infile.read()
     return feed_data
 
@@ -46,8 +47,6 @@ def test_parse_feed_type():
     txt_feed = txt_feed_dict()
     csv_veed = csv_feed_dict()
 
-
-
 def test_clean_csv_feed():
     feed = csv_feed_dict()
     data = csv_test_data()