Commit 437c549b by Peter Weidenbach

minor cleanups; pytest and travis support added

parent 657c2abc
language: python
python:
- "3.5"
- "3.6"
# command to install dependencies
install:
- "apt-get install clamdscan"
- "python setup.py -q install"
- "pip install pytest-pep8"
# command to run tests
script: pytest
from .oms import CommonAnalysisOMS, plugin_version from .oms import CommonAnalysisOMS
__version__ = plugin_version
__all__ = [ __all__ = [
'CommonAnalysisOMS', 'CommonAnalysisOMS',
'__version__'
] ]
analysis_class = CommonAnalysisOMS analysis_class = CommonAnalysisOMS
...@@ -9,7 +9,7 @@ from re import findall ...@@ -9,7 +9,7 @@ from re import findall
from subprocess import Popen, PIPE from subprocess import Popen, PIPE
from time import time from time import time
plugin_version = "0.2.5" plugin_version = "0.2.6"
system_version = plugin_version system_version = plugin_version
......
[pytest]
addopts = --pep8 -v
pep8ignore =
*.py E501
from setuptools import setup from setuptools import setup
from common_analysis_oms import __version__
VERSION = '0.2.6'
setup( setup(
name="common_analysis_oms", name="common_analysis_oms",
version=__version__, version=VERSION,
packages=['common_analysis_oms'], packages=['common_analysis_oms'],
package_dir={'common_analysis_oms': 'common_analysis_oms'}, package_dir={'common_analysis_oms': 'common_analysis_oms'},
package_data={'common_analysis_oms': ['plugins/*']}, package_data={'common_analysis_oms': ['plugins/*']},
...@@ -18,10 +20,10 @@ setup( ...@@ -18,10 +20,10 @@ setup(
'common_analysis_oms/plugins/F-Secure.json', 'common_analysis_oms/plugins/F-Secure.json',
'common_analysis_oms/plugins/McAfee.json'])], 'common_analysis_oms/plugins/McAfee.json'])],
install_requires=[ install_requires=[
'common_analysis_base', 'common_analysis_base >= 0.1',
], ],
dependency_links=[ dependency_links=[
'git+https://github.com/mass-project/common_analysis_base.git#common_analysis_base' 'https://github.com/mass-project/common_analysis_base/tarball/master#egg=common_analysis_base-0.1'
], ],
author="Fraunhofer FKIE", author="Fraunhofer FKIE",
author_email="peter.weidenbach@fkie.fraunhofer.de", author_email="peter.weidenbach@fkie.fraunhofer.de",
......
...@@ -42,7 +42,3 @@ class Test(unittest.TestCase): ...@@ -42,7 +42,3 @@ class Test(unittest.TestCase):
self.assertIn('scans', result, "scans not in result") self.assertIn('scans', result, "scans not in result")
self.assertIn('plugin_version', result, "plugin_version not in results") self.assertIn('plugin_version', result, "plugin_version not in results")
self.assertAlmostEqual(result['analysis_date'], time(), msg="Time not correct. This test might fail, if you installed many AVs", delta=120) self.assertAlmostEqual(result['analysis_date'], time(), msg="Time not correct. This test might fail, if you installed many AVs", delta=120)
if __name__ == "__main__":
unittest.main()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment