Style/lint fixes

stix2.1
Greg Back 2017-05-31 08:58:14 -05:00
parent 6c3a689f02
commit 53ddf32e8c
1 changed files with 69 additions and 82 deletions

View File

@ -1,29 +1,24 @@
import pytest
import requests
from stix2.sources import taxii
#Data Source (common API)
#TAXII
def test_ds_taxii():
ds = taxii.TAXIIDataSource()
assert ds.name == 'TAXII'
def test_ds_taxii_name():
ds = taxii.TAXIIDataSource(name='My Data Source Name')
assert ds.name == "My Data Source Name"
def test_ds_params():
url = "http://taxii_url.com:5000"
creds = {"username": "Wade", "password": "Wilson"}
ds = taxii.TAXIIDataSource(api_root=url,
auth= creds)
ds = taxii.TAXIIDataSource(api_root=url, auth=creds)
assert ds.taxii_info['api_root']['url'] == url
assert ds.taxii_info['auth'] == creds
def test_parse_taxii_filters():
query = [
{
@ -136,32 +131,24 @@ def test_add_get_remove_filter():
assert statuses[6]['errors'][0] == expected_errors[3]
#File
'''
def test_data_source_file():
ds = file.FileDataSource()
assert ds.name == "DataSource"
def test_data_source_name():
ds = file.FileDataSource(name="My File Data Source")
assert ds.name == "My File Data Source"
def test_data_source_get():
ds = file.FileDataSource(name="My File Data Source")
with pytest.raises(NotImplementedError):
ds.get("foo")
#filter testing
def test_add_filter():
ds = file.FileDataSource()
'''
# def test_data_source_file():
# ds = file.FileDataSource()
#
# assert ds.name == "DataSource"
#
#
# def test_data_source_name():
# ds = file.FileDataSource(name="My File Data Source")
#
# assert ds.name == "My File Data Source"
#
#
# def test_data_source_get():
# ds = file.FileDataSource(name="My File Data Source")
#
# with pytest.raises(NotImplementedError):
# ds.get("foo")
#
# #filter testing
# def test_add_filter():
# ds = file.FileDataSource()