Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Post-PEP8 Fixes #157

Merged
merged 3 commits into from
Apr 15, 2019
+34 −43
Merged

Post-PEP8 Fixes #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c2e1df8
skip sort, gitignore 3rd party libs
jmeixensperger Apr 10, 2019
7a923a7
fixed yapf ignore, ran format across repo
jmeixensperger Apr 10, 2019
a5bcb58
Merge branch 'develop' into pep8-fix
jmeixensperger Apr 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .yapfignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
splunk_eventgen/lib/concurrent
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we use pip to install the 3rd party lib instead of putting all the code into our code repo?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have a story to track this.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, go ahead and remove this file once that's done then.

splunk_eventgen/lib/requests_futures
6 changes: 6 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,3 +117,9 @@ else
@yapf -i $(NEWLY_ADDED_PY_FILES)
endif

lint-all:
@flake8 .

format-all:
@isort -rc .
@yapf -r -i .
3 changes: 1 addition & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,4 @@ def readme():
'pyOpenSSL',
'flake8>=3.7.7',
'yapf>=0.26.0',
'isort>=4.3.15'
])
'isort>=4.3.15'])
3 changes: 1 addition & 2 deletions splunk_eventgen/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,12 @@

import requests

import eventgen_core

FILE_LOCATION = os.path.dirname(os.path.abspath(__file__))
path_prepend = os.path.join(FILE_LOCATION, 'lib')
sys.path.append(path_prepend)

import __init__ as splunk_eventgen_init # noqa isort:skip
import eventgen_core # noqa isort:skip

EVENTGEN_VERSION = splunk_eventgen_init.__version__
logger = logging.getLogger()
Expand Down
3 changes: 1 addition & 2 deletions splunk_eventgen/splunk_app/lib/modinput/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
from splunk.models.app import App
from xmloutput import setupLogger

from .fields import (BooleanField, Field, FieldValidationException,
IntervalField)
from .fields import (BooleanField, Field, FieldValidationException, IntervalField)

try:
from splunk.clilib.bundle_paths import make_splunkhome_path
Expand Down
3 changes: 3 additions & 0 deletions tests/unit/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from os import path as op

import pytest

from splunk_eventgen.lib.eventgenconfig import Config
Expand All @@ -7,8 +8,10 @@
@pytest.fixture
def eventgen_config():
"""Returns a function to create config instance based on config file"""

def _make_eventgen_config_instance(configfile=None):
if configfile is not None:
configfile = op.join(op.dirname(op.dirname(__file__)), 'sample_eventgen_conf', 'unit', configfile)
return Config(configfile=configfile)

return _make_eventgen_config_instance
1 change: 1 addition & 0 deletions tests/unit/test_eventgenconfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import json
import os
from ConfigParser import ConfigParser

import pytest

from splunk_eventgen.lib.eventgensamples import Sample
Expand Down
56 changes: 19 additions & 37 deletions tests/unit/test_timeparser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@
from splunk_eventgen.lib import timeparser

time_delta_test_params = [(datetime.timedelta(days=1), 86400),
(datetime.timedelta(
days=1, hours=3, minutes=15, seconds=32), 98132),
(datetime.timedelta(hours=1, minutes=10), 4200),
(datetime.timedelta(hours=-1), -3600), (None, 0)]
(datetime.timedelta(days=1, hours=3, minutes=15, seconds=32), 98132),
(datetime.timedelta(hours=1, minutes=10), 4200), (datetime.timedelta(hours=-1), -3600),
(None, 0)]


@pytest.mark.parametrize('delta,expect', time_delta_test_params)
Expand All @@ -35,25 +34,19 @@ def check_datetime_equal(d1, d2):
assert d1.second == d2.second


parse_time_math_params = [('+', '100', 's',
datetime.datetime(2019, 3, 8, 4, 10, 20),
parse_time_math_params = [('+', '100', 's', datetime.datetime(2019, 3, 8, 4, 10, 20),
datetime.datetime(2019, 3, 8, 4, 12, 0)),
('-', '20', 'm',
datetime.datetime(2019, 3, 8, 4, 10, 20),
('-', '20', 'm', datetime.datetime(2019, 3, 8, 4, 10, 20),
datetime.datetime(2017, 7, 8, 4, 10, 20)),
('', '3', 'w',
datetime.datetime(2019, 3, 8, 4, 10, 20),
('', '3', 'w', datetime.datetime(2019, 3, 8, 4, 10, 20),
datetime.datetime(2019, 3, 29, 4, 10, 20)),
('', '0', 's',
datetime.datetime(2019, 3, 8, 4, 10, 20),
('', '0', 's', datetime.datetime(2019, 3, 8, 4, 10, 20),
datetime.datetime(2019, 3, 8, 4, 10, 20)),
('', '123', '',
datetime.datetime(2019, 3, 8, 4, 10, 20),
('', '123', '', datetime.datetime(2019, 3, 8, 4, 10, 20),
datetime.datetime(2019, 3, 8, 4, 10, 20))]


@pytest.mark.parametrize('plusminus,num,unit,ret,expect',
parse_time_math_params)
@pytest.mark.parametrize('plusminus,num,unit,ret,expect', parse_time_math_params)
def test_time_parser_time_math(plusminus, num, unit, ret, expect):
'''
test timeParserTimeMath function, parse the time modifier
Expand All @@ -78,27 +71,16 @@ def mock_utc_now():


timeparser_params = [
('now', datetime.timedelta(days=1),
datetime.datetime(2019, 3, 10, 13, 20, 15)),
('now', datetime.timedelta(days=0),
datetime.datetime(2019, 3, 10, 5, 20, 15)),
('now', datetime.timedelta(hours=2),
datetime.datetime(2019, 3, 10, 7, 20, 15)),
('now', datetime.timedelta(hours=-3),
datetime.datetime(2019, 3, 10, 2, 20, 15)),
('-7d', datetime.timedelta(days=1),
datetime.datetime(2019, 3, 3, 13, 20, 15)),
('-0mon@mon', datetime.timedelta(days=1),
datetime.datetime(2019, 3, 1, 0, 0, 0)),
('-1mon@mon', datetime.timedelta(days=1),
datetime.datetime(2019, 2, 1, 0, 0, 0)),
('-3d@d', datetime.timedelta(days=1), datetime.datetime(
2019, 3, 7, 0, 0, 0)),
('+5d', datetime.timedelta(days=1),
datetime.datetime(2019, 3, 15, 13, 20, 15)),
('', datetime.timedelta(days=1),
datetime.datetime(2019, 3, 10, 13, 20, 15)),
]
('now', datetime.timedelta(days=1), datetime.datetime(2019, 3, 10, 13, 20, 15)),
('now', datetime.timedelta(days=0), datetime.datetime(2019, 3, 10, 5, 20, 15)),
('now', datetime.timedelta(hours=2), datetime.datetime(2019, 3, 10, 7, 20, 15)),
('now', datetime.timedelta(hours=-3), datetime.datetime(2019, 3, 10, 2, 20, 15)),
('-7d', datetime.timedelta(days=1), datetime.datetime(2019, 3, 3, 13, 20, 15)),
('-0mon@mon', datetime.timedelta(days=1), datetime.datetime(2019, 3, 1, 0, 0, 0)),
('-1mon@mon', datetime.timedelta(days=1), datetime.datetime(2019, 2, 1, 0, 0, 0)),
('-3d@d', datetime.timedelta(days=1), datetime.datetime(2019, 3, 7, 0, 0, 0)),
('+5d', datetime.timedelta(days=1), datetime.datetime(2019, 3, 15, 13, 20, 15)),
('', datetime.timedelta(days=1), datetime.datetime(2019, 3, 10, 13, 20, 15)), ]


@pytest.mark.parametrize('ts,tz,expect', timeparser_params)
Expand Down