Merge pull request #8 from marpaia/travis

travis ci

Author: marpaia

.travis.yml

@@ -0,0 +1,12 @@
+language: python
+python:
+  - "2.6"
+  - "2.7"
+  - "3.2"
+  - "3.3"
+  - "3.4"
+install:
+  - pip install -r requirements.txt
+script:
+  - python setup.py build
+  - python setup.py test

osquery/extensions/Extension.py

@@ -82,7 +82,10 @@ def run(self):
       author_email="osquery@fb.com",
       url="https://osquery.io",
       license=LICENSE,
-      packages=["osquery",],
+      packages=[
+          "osquery",
+          "osquery.extensions",
+      ],
       install_requires=[
           "thrift>=0.9",
           "argparse>=1.1",

osquery/extensions/ExtensionManager.py

@@ -8,13 +8,13 @@
 from __future__ import print_function
 from __future__ import unicode_literals
 
-from os.path import dirname, abspath
 import json
+import os
 import sys
 import unittest
 
-sys.path.insert(0, abspath("%s/../build/lib" % dirname(abspath(__file__))))
-
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__),
+                                                "../build/lib/")))
 import osquery
 
 class MockConfigPlugin(osquery.ConfigPlugin):
@@ -49,7 +49,7 @@ def test_simple_call(self):
                                     {"action":"genConfig"})
         self.assertEqual(0, response.status.code)
         self.assertTrue(len(response.response) > 0)
-        self.assertIn("source_1", response.response[0])
+        self.assertTrue("source_1" in response.response[0])
 
 if __name__ == '__main__':
     unittest.main()

setup.py

@@ -8,11 +8,12 @@
 from __future__ import print_function
 from __future__ import unicode_literals
 
-from os.path import dirname, abspath
+import os
 import sys
 import unittest
 
-sys.path.insert(0, abspath("%s/../build/lib" % dirname(abspath(__file__))))
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__),
+                                                "../build/lib/")))
 
 import osquery
 

tests/config_plugin_tests.py tests/test_config_plugin.pytests/config_plugin_tests.py renamed to tests/test_config_plugin.py

@@ -8,11 +8,12 @@
 from __future__ import print_function
 from __future__ import unicode_literals
 
-from os.path import dirname, abspath
+import os
 import sys
 import unittest
 
-sys.path.insert(0, abspath("%s/../build/lib" % dirname(abspath(__file__))))
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__),
+                                                "../build/lib/")))
 
 import osquery
 

tests/logger_plugin_tests.py tests/test_logger_plugin.pytests/logger_plugin_tests.py renamed to tests/test_logger_plugin.py

@@ -10,11 +10,12 @@
 from __future__ import print_function
 from __future__ import unicode_literals
 
-from os.path import dirname, abspath
+import os
 import sys
 import unittest
 
-sys.path.insert(0, abspath("%s/../build/lib" % dirname(abspath(__file__))))
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__),
+                                                "../build/lib/")))
 
 import osquery
 

tests/plugin_tests.py tests/test_plugin.pytests/plugin_tests.py renamed to tests/test_plugin.py

@@ -8,11 +8,12 @@
 from __future__ import print_function
 from __future__ import unicode_literals
 
-from os.path import dirname, abspath
+import os
 import sys
 import unittest
 
-sys.path.insert(0, abspath("%s/../build/lib" % dirname(abspath(__file__))))
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__),
+                                                "../build/lib/")))
 
 import osquery
 
@@ -45,8 +46,8 @@ def test_plugin_was_registered(self):
         """Tests to ensure that a plugin was registered"""
         osquery.ExtensionManager().add_plugin(MockTablePlugin)
         registry = osquery.ExtensionManager().registry()
-        self.assertIn("table", registry)
-        self.assertIn("foobar", registry["table"])
+        self.assertTrue("table" in registry)
+        self.assertTrue("foobar" in registry["table"])
 
     def test_routes_are_correct(self):
         """Tests to ensure that a plugins routes are correct"""