p36850791
/
kinetic-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updated to rosmaster

This commit is contained in:
Ken Conley 2010-02-16 22:12:51 +00:00
parent d703706ade
commit e9b25ed067
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/test_roslaunch/test/test_core.py
View File

@ -261,20 +261,20 @@ class TestCore(unittest.TestCase):
try:
os.environ['ROS_MASTER_URI'] = 'http://foo:789'
m = Master()
self.assertEquals(m.type, Master.ZENMASTER)
self.assertEquals(m.type, Master.ROSMASTER)
self.assertEquals(m.uri, 'http://foo:789')
self.assertEquals(m.auto, Master.AUTO_NO)
self.assertEquals(m.log_output, False)
self.assertEquals(m, m)
self.assertEquals(m, Master())
m = Master(Master.ZENMASTER, 'http://foo:1234', Master.AUTO_START)
self.assertEquals(m.type, Master.ZENMASTER)
m = Master(Master.ROSMASTER, 'http://foo:1234', Master.AUTO_START)
self.assertEquals(m.type, Master.ROSMASTER)
self.assertEquals(m.uri, 'http://foo:1234')
self.assertEquals(m.auto, Master.AUTO_START)
self.assertEquals(m.log_output, False)
self.assertEquals(m, m)
self.assertEquals(m, Master(Master.ZENMASTER, 'http://foo:1234', Master.AUTO_START))
self.assertEquals(m, Master(Master.ROSMASTER, 'http://foo:1234', Master.AUTO_START))
import xmlrpclib
self.assert_(isinstance(m.get(), xmlrpclib.ServerProxy))
@ -283,11 +283,11 @@ class TestCore(unittest.TestCase):
self.failIf(m.is_running())
try:
m = Master(Master.ZENMASTER, 'http://foo:1234', False)
m = Master(Master.ROSMASTER, 'http://foo:1234', False)
self.fail("should have failed on invalid auto value")
except: pass
try:
m = Master(Master.ZENMASTER, 'http://foo:1234', 123)
m = Master(Master.ROSMASTER, 'http://foo:1234', 123)
self.fail("should have failed on invalid auto value")
except: pass

2
test/test_roslaunch/test/test_nodeprocess.py
View File

@ -77,7 +77,7 @@ class TestNodeprocess(unittest.TestCase):
self.assertEquals(p.args[idx+1], str(port))
self.assert_('--core' in p.args)
self.assertEquals(p.package, 'rospy')
self.assertEquals(p.package, 'rosmaster')
self.failIf(p.log_output)
p = create_master_process(run_id, type, ros_root, port, log_output=True)