HWT-189: minor fixes

common_analysis_oms/oms.py

@@ -10,9 +10,11 @@ from os import listdir, path
 from distutils import spawn
 import logging
 import pkg_resources
+from time import time
 
+# can be removed when common analysis base is fixed
 try:
-    plugin_version = pkg_resources.get_distribution("common_analysis_oms")
+    plugin_version = pkg_resources.get_distribution("common_analysis_oms").version
 except:
     plugin_version = get_version_string_from_git(get_directory_for_filename(__file__))
 
@@ -111,5 +113,7 @@ class CommonAnalysisOMS(AnalysisPluginFile):
         self.result_dict["scanners"] = [av["name"] for av in self.av_list]
         self.result_dict["number_of_scanners"] = len(self.result_dict["scanners"])
         self.result_dict["scans"] = self.execute_scans(file_to_analyze)
+        # can be removed when common_analysis base is fixed
+        self.result_dict["analysis_date"] = time()
         logging.debug(self.result_dict)
         return self.result_dict

setup.py

@@ -6,6 +6,16 @@ setup(
     name="common_analysis_oms",
     version=subprocess.check_output(['git', 'describe', '--always'], cwd=os.path.dirname(os.path.abspath(__file__))).strip().decode('utf-8'),
     packages=find_packages(),
+    data_files=[('common_analysis_oms/plugins', ['common_analysis_oms/plugins/ClamAV.json',
+                                                 'common_analysis_oms/plugins/Sophos_en.json',
+                                                 'common_analysis_oms/plugins/Avast.json',
+                                                 'common_analysis_oms/plugins/AVG.json',
+                                                 'common_analysis_oms/plugins/Bitdefender.json',
+                                                 'common_analysis_oms/plugins/Comodo.json',
+                                                 'common_analysis_oms/plugins/Eset.json',
+                                                 'common_analysis_oms/plugins/F-Prot.json',
+                                                 'common_analysis_oms/plugins/F-Secure.json',
+                                                 'common_analysis_oms/plugins/McAfee.json'])],
     install_requires=[
         'common_analysis_base',
         'common_helper_files'

tests/test_oms.py

@@ -41,7 +41,7 @@ class Test(unittest.TestCase):
         self.assertGreater(result['positives'], 0, "should be at least 1")
         self.assertIn('scans', result, "scans not in result")
         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__":