Merge branch 'f-unittests-virtualenv' into dev

Close Issue #34.
DFE · May 21, 2013 · 87659a8 · 87659a8
2 parents 9fe0cf4 + b916381
commit 87659a8
Show file tree

Hide file tree

Showing 18 changed files with 123 additions and 738 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,12 +16,11 @@ python:
  - "2.7"
 
 install:
- - "python setup.py sdist"
- - "pip install dist/monk_tf-0.1.1.tar.gz"
+ - "pip install -r test-env.txt"
+ - "python setup.py develop"
 
 script:
- - "python test/test_all.py"
+ - "python setup.py nosetests"
 
 before_install:
- - "sudo apt-get install python2.7 python2.7-dev libssh2-1 libssh2-1-dev"
- - "sudo apt-get install python-pip"
+ - "sudo apt-get install python2.7-dev libssh2-1-dev"
diff --git a/src/monk_tf/__init__.py → monk_tf/__init__.py b/src/monk_tf/__init__.py → monk_tf/__init__.py
diff --git a/src/monk_tf/bcc.py → monk_tf/bcc.py b/src/monk_tf/bcc.py → monk_tf/bcc.py
diff --git a/src/monk_tf/connection.py → monk_tf/connection.py b/src/monk_tf/connection.py → monk_tf/connection.py
diff --git a/src/monk_tf/device.py → monk_tf/device.py b/src/monk_tf/device.py → monk_tf/device.py
diff --git a/src/monk_tf/devicetestcase.py → monk_tf/devicetestcase.py b/src/monk_tf/devicetestcase.py → monk_tf/devicetestcase.py
diff --git a/src/monk_tf/serial_conn.py → monk_tf/serial_conn.py b/src/monk_tf/serial_conn.py → monk_tf/serial_conn.py
diff --git a/src/monk_tf/ssh_conn.py → monk_tf/ssh_conn.py b/src/monk_tf/ssh_conn.py → monk_tf/ssh_conn.py
diff --git a/setup.cfg b/setup.cfg
@@ -0,0 +1,14 @@
+[nosetests]
+#should not be set to 1 until bug is fixed in nosetests project
+verbosity=2
+detailed-errors=1
+#xml output for jenkins and the likes
+with-xunit=1
+#coverage with xml as well
+with-xcoverage=1
+#only cover the monk package and leave the rest of python alone
+cover-package=monk_tf
+debug=nose.loader
+# options to be set later:
+#pdb=1
+#pdb-failures=1
diff --git a/setup.py b/setup.py
@@ -11,25 +11,27 @@
 # 2 of the License, or (at your option) any later version.
 #
 
-from distutils.core import setup
+from setuptools import setup
 
-project = 'monk_tf'
-src_path = 'src'
-version = '0.1.1'
+project = "monk_tf"
+version = "0.1.1"
 
 setup(
     name=project,
     version=version,
-    description = 'a test framework for embedded systems',
-    author = 'DResearch Fahrzeugelektronik GmbH',
-    author_email = 'project-monk@dresearch-fe.de',
-    url='https://github.com/DFE/MONK',
+    description = "a test framework for embedded systems",
+    author = "DResearch Fahrzeugelektronik GmbH",
+    author_email = "project-monk@dresearch-fe.de",
+    url="https://github.com/DFE/MONK",
     packages=[project],
-    package_dir = { '' : src_path },
+    setup_requires = [
+        "nose >= 1.0"
+    ],
     install_requires = [
-        'pyserial ==2.5',
-        'pylibssh2 ==1.0.1'
+        "pyserial >=2.5",
+        "pylibssh2 >=1.0.1"
     ],provides = [
-        '{} ({})'.format(project, version)
-    ]
+        "{} ({})".format(project, version)
+    ],
+    test_suite = "nose.collector"
 )
diff --git a/test-env.txt b/test-env.txt
@@ -0,0 +1,6 @@
+argparse==1.2.1
+coverage==3.6
+distribute==0.6.34
+nose==1.3.0
+nosexcover==1.0.8
+wsgiref==0.1.2
diff --git a/test/test_all.py b/test/test_all.py
diff --git a/test/test_bcc.py b/test/test_bcc.py