somewhat cleaner test run. Now relying on pypi released test depends.

pyros-dev · Aug 31, 2017 · c44e1fd · c44e1fd
1 parent 19c0030
commit c44e1fd
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 35 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,3 +1,6 @@
 # default
 include README.rst
 include setup.py
+
+# including tests in sdist
+recursive-include tests *
diff --git a/requirements/indigo/debs_in_venv.txt b/requirements/indigo/debs_in_venv.txt
@@ -9,7 +9,7 @@ numpy>=1.8.1
 -e git+https://github.com/asmodehn/genmsg.git@setuptools#egg=ros_genmsg
 -e git+https://github.com/asmodehn/genpy.git@setuptools#egg=ros_genpy
 
-# source access to latest filefinder and rosimport from git ...
--e git+https://github.com/asmodehn/filefinder2.git#egg=filefinder2
--e git+https://github.com/asmodehn/rosimport.git#egg=rosimport
+# These dependencies are python pkgs only and only for tests.
+filefinder2
+rosimport
 
diff --git a/requirements/kinetic/debs_in_venv.txt b/requirements/kinetic/debs_in_venv.txt
@@ -9,7 +9,7 @@ numpy==1.11.0
 -e git+https://github.com/asmodehn/genmsg.git@setuptools#egg=ros_genmsg
 -e git+https://github.com/asmodehn/genpy.git@setuptools-kinetic#egg=ros_genpy
 
-# source access to latest filefinder and rosimport from git ...
--e git+https://github.com/asmodehn/filefinder2.git#egg=filefinder2
--e git+https://github.com/asmodehn/rosimport.git#egg=rosimport
+# These dependencies are python pkgs only and only for tests.
+filefinder2
+rosimport
 
diff --git a/requirements/lunar/debs_in_venv.txt b/requirements/lunar/debs_in_venv.txt
@@ -9,6 +9,6 @@ numpy==1.11.0
 -e git+https://github.com/asmodehn/genmsg.git@setuptools#egg=ros_genmsg
 -e git+https://github.com/asmodehn/genpy.git@setuptools-kinetic#egg=ros_genpy
 
-# source access to latest filefinder and rosimport from git ...
--e git+https://github.com/asmodehn/filefinder2.git#egg=filefinder2
--e git+https://github.com/asmodehn/rosimport.git#egg=rosimport
+# These dependencies are python pkgs only and only for tests.
+filefinder2
+rosimport
diff --git a/requirements/python/indigo.txt b/requirements/python/indigo.txt
@@ -5,7 +5,4 @@
 -e git+https://github.com/asmodehn/genmsg.git@setuptools#egg=ros_genmsg
 -e git+https://github.com/asmodehn/genpy.git@setuptools#egg=ros_genpy
 
-# source access to latest filefinder and rosimport from git ...
--e git+https://github.com/asmodehn/filefinder2.git#egg=filefinder2
--e git+https://github.com/asmodehn/rosimport.git#egg=rosimport
 
diff --git a/requirements/python/kinetic.txt b/requirements/python/kinetic.txt
@@ -5,7 +5,4 @@
 -e git+https://github.com/asmodehn/genmsg.git@setuptools#egg=ros_genmsg
 -e git+https://github.com/asmodehn/genpy.git@setuptools-kinetic#egg=ros_genpy
 
-# source access to latest filefinder and rosimport from git ...
--e git+https://github.com/asmodehn/filefinder2.git#egg=filefinder2
--e git+https://github.com/asmodehn/rosimport.git#egg=rosimport
 
diff --git a/requirements/python/latest.txt b/requirements/python/latest.txt
@@ -4,6 +4,3 @@
 -e git+https://github.com/asmodehn/genmsg.git@setuptools#egg=ros_genmsg
 -e git+https://github.com/asmodehn/genpy.git@setuptools-kinetic#egg=ros_genpy
 
-# source access to latest filefinder and rosimport from git ...
--e git+https://github.com/asmodehn/filefinder2.git#egg=filefinder2
--e git+https://github.com/asmodehn/rosimport.git#egg=rosimport
diff --git a/requirements/python/lunar.txt b/requirements/python/lunar.txt
@@ -5,6 +5,3 @@
 -e git+https://github.com/asmodehn/genmsg.git@setuptools#egg=ros_genmsg
 -e git+https://github.com/asmodehn/genpy.git@setuptools-kinetic#egg=ros_genpy
 
-# source access to latest filefinder and rosimport from git ...
--e git+https://github.com/asmodehn/filefinder2.git#egg=filefinder2
--e git+https://github.com/asmodehn/rosimport.git#egg=rosimport
diff --git a/requirements/python/tests.txt b/requirements/python/tests.txt
@@ -3,3 +3,7 @@ pytest
 pytest-xdist  # for --boxed
 hypothesis
 numpy
+
+# These dependencies are python pkgs only and only for tests.
+filefinder2
+rosimport
diff --git a/tests/test_pyros_msgs/__init__.py b/tests/test_pyros_msgs/__init__.py
diff --git a/tests/test_pyros_msgs/typecheck/test_ros_mappings.py b/tests/test_pyros_msgs/typecheck/test_ros_mappings.py
@@ -39,19 +39,19 @@
 # The main point here is insuring that any sanitized type will safely serialize and deserialize
 # And also that any type that doesnt safely serialize / deserialize will not pass the type checker
 
-rosmsg_slot_types = [
-    ('bool', st.booleans()),
-    ('int', st.integers()),
-    ('float', st.floats()),
-    ('string', st.binary()),
-    ('time', st.builds(genpy.Time, secs=st.integers(min_value=0), nsecs=st.integers(min_value=0))),  # ROS time
-    ('duration', st.builds(genpy.Duration, secs=st.integers(), nsecs=st.integers())),  # ROS duration
-]
-
-rosmsg_slot_arraytypes = [
-    (s[0] + '[]',  st.lists(elements=s[1]))
-    for s in rosmsg_slot_types
-]
+# rosmsg_slot_types = [
+#     ('bool', st.booleans()),
+#     ('int', st.integers()),
+#     ('float', st.floats()),
+#     ('string', st.binary()),
+#     ('time', st.builds(genpy.Time, secs=st.integers(min_value=0), nsecs=st.integers(min_value=0))),  # ROS time
+#     ('duration', st.builds(genpy.Duration, secs=st.integers(), nsecs=st.integers())),  # ROS duration
+# ]
+#
+# rosmsg_slot_arraytypes = [
+#     (s[0] + '[]',  st.lists(elements=s[1]))
+#     for s in rosmsg_slot_types
+# ]
 
 # TODO : is there a way to generate messages on the fly to test all possible field combinations ?
 

diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,8 @@
 # tox.ini , put in same dir as setup.py
 [tox]
 
+skip_missing_interpreters=True
+
 envlist =
 
   # based on ros distro with ubuntu debs base
@@ -46,6 +48,10 @@ ROS_DISTRO =
 
 [testenv]
 
+setenv =
+    # prevent tox to create a bunch of useless bytecode files in tests/
+    PYTHONDONTWRITEBYTECODE=1
+
 # Dependencies matching the version in each ROS distro
 deps =
     # TODO : check why / how install_requires are installed or not in tox environments...
@@ -70,8 +76,10 @@ deps =
 # to always force recreation and avoid unexpected side effects
 recreate=True
 
+changedir = tests
+
 commands=
     # we want to make sure python finds the installed package in tox env
     # and doesn't confuse with pyc generated during dev (which happens if we use self test feature here)
-    py.test --pyargs tests {posargs}
+    py.test --basetemp={envtmpdir} test_pyros_msgs {posargs}
     # Note : -s here might break your terminal...