[ros-rospkg] 01/01: Fix unit tests

[Jochen Sprickerhof]

This is an automated email from the git hooks/post-receive script.

jspricke-guest pushed a commit to branch master
in repository ros-rospkg.

commit 9092157cc13be61600cf4600cef6ebd5e99505cd
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Wed Aug 10 22:03:42 2016 +0200

    Fix unit tests
---
 ...Set-default-ROS_PACKAGE_PATH-to-usr-share.patch | 26 ++++++++++++++++++++--
 .../patches/0002-Limit-search-in-usr-share.patch   |  2 +-
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/debian/patches/0001-Set-default-ROS_PACKAGE_PATH-to-usr-share.patch b/debian/patches/0001-Set-default-ROS_PACKAGE_PATH-to-usr-share.patch
index 53210cb..00ea333 100644
--- a/debian/patches/0001-Set-default-ROS_PACKAGE_PATH-to-usr-share.patch
+++ b/debian/patches/0001-Set-default-ROS_PACKAGE_PATH-to-usr-share.patch
@@ -3,8 +3,9 @@ Date: Wed, 8 Apr 2015 18:01:46 +0200
 Subject: Set default ROS_PACKAGE_PATH to /usr/share
 
 ---
- src/rospkg/environment.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ src/rospkg/environment.py       | 2 +-
+ test/test_rospkg_environment.py | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/src/rospkg/environment.py b/src/rospkg/environment.py
 index 63b7abc..ce340e8 100644
@@ -19,3 +20,24 @@ index 63b7abc..ce340e8 100644
  
  def get_ros_home(env=None):
      """
+diff --git a/test/test_rospkg_environment.py b/test/test_rospkg_environment.py
+index 5f67159..1f8532b 100644
+--- a/test/test_rospkg_environment.py
++++ b/test/test_rospkg_environment.py
+@@ -54,13 +54,13 @@ def test_get_ros_root():
+     
+ def test_get_ros_package_path():
+     from rospkg import get_ros_package_path
+-    assert None == get_ros_package_path(env={})
++    assert ':/usr/share' == get_ros_package_path(env={})
+     env = {'ROS_PACKAGE_PATH': ':'}
+-    assert ':' == get_ros_package_path(env=env)
++    assert '::/usr/share' == get_ros_package_path(env=env)
+ 
+     # trip-wire tests. Cannot guarantee that ROS_PACKAGE_PATH is set
+     # to valid value on test machine, just make sure logic doesn't crash
+-    assert os.environ.get('ROS_PACKAGE_PATH', None) == get_ros_package_path()
++    assert os.environ.get('ROS_PACKAGE_PATH', ':/usr/share') == get_ros_package_path()
+ 
+ def test_get_log_dir():
+     from rospkg import get_log_dir, get_ros_root
diff --git a/debian/patches/0002-Limit-search-in-usr-share.patch b/debian/patches/0002-Limit-search-in-usr-share.patch
index 872c4b7..9e2a52d 100644
--- a/debian/patches/0002-Limit-search-in-usr-share.patch
+++ b/debian/patches/0002-Limit-search-in-usr-share.patch
@@ -9,7 +9,7 @@ ROS packages.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/rospkg/rospack.py b/src/rospkg/rospack.py
-index e55acec..e21e243 100644
+index 8050f5f..1c61192 100644
 --- a/src/rospkg/rospack.py
 +++ b/src/rospkg/rospack.py
 @@ -89,7 +89,7 @@ def list_by_path(manifest_name, path, cache):

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-rospkg.git