summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkali <kali@leap.se>2012-08-22 04:52:31 +0900
committerkali <kali@leap.se>2012-08-22 04:53:40 +0900
commit6fcbd68152689f98d9c5b7526eee2e1e9b7dd0a2 (patch)
tree77d7ad57532d16de4fd71ab5689241934dbf3134
parent5f6064b9dfa102b1115d5e3a6ecfb22cdcf82d14 (diff)
minor tweaks to setup + env test
-rwxr-xr-xsetup.py23
-rw-r--r--src/leap/eip/tests/test_config.py1
-rw-r--r--tests/test_qt_environment.py4
3 files changed, 23 insertions, 5 deletions
diff --git a/setup.py b/setup.py
index 0ee6a1b5..95559571 100755
--- a/setup.py
+++ b/setup.py
@@ -33,8 +33,24 @@ setup(
# XXX FIXME DEPS
# deps: pyqt
- # test_deps: nose
+
# build_deps: pyqt-utils
+ # XXX fixme move resource reloading
+ # to this setup script.
+
+ # XXX should implement a parse_requirements
+ # and get them from the pip reqs. workaround needed
+ # for argparse and <=2.6
+ install_requires=[
+ # -*- Extra requirements: -*-
+ ],
+ test_suite='nose.collector',
+
+ # XXX change to parse_test_requirements and
+ # get them from pip reqs.
+ test_requires=[
+ "nose",
+ "mock"],
keywords='leap, client, qt, encryption',
author='leap project',
@@ -46,9 +62,8 @@ setup(
exclude=['ez_setup', 'setup', 'examples', 'tests']),
include_package_data=True,
zip_safe=False,
- install_requires=[
- # -*- Extra requirements: -*-
- ],
+
+ # XXX platform switch
data_files=[
("share/man/man1",
["docs/leap.1"]),
diff --git a/src/leap/eip/tests/test_config.py b/src/leap/eip/tests/test_config.py
index 12679ec6..11433777 100644
--- a/src/leap/eip/tests/test_config.py
+++ b/src/leap/eip/tests/test_config.py
@@ -195,7 +195,6 @@ class EIPConfigTest(unittest.TestCase):
# many combinations. we should inject some
# params in the function call, to disable
# some checks.
- # XXX breaking!
def test_build_ovpn_command_empty_config(self):
_config = self.get_empty_config()
diff --git a/tests/test_qt_environment.py b/tests/test_qt_environment.py
index 08fccf4b..d97322b9 100644
--- a/tests/test_qt_environment.py
+++ b/tests/test_qt_environment.py
@@ -37,3 +37,7 @@ class QtEnvironTest(unittest.TestCase):
self.assertEqual(
self.win.trayIcon.isSystemTrayAvailable(),
True)
+
+
+if __name__ == "__main__":
+ unittest.main()