Allow empty machine arg in node tag. (#1885)

* Allow empty machine tag. Fixes #274. * Fix tests for machine arg in node tag. * Remove obsolete test. * Remove obsolete test
ros · Feb 20, 2020 · fa9271d · fa9271d
1 parent 7ad4625
commit fa9271d
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 6 deletions.
diff --git a/tools/roslaunch/src/roslaunch/xmlloader.py b/tools/roslaunch/src/roslaunch/xmlloader.py
@@ -388,8 +388,6 @@ def _node_tag(self, tag, context, ros_config, default_machine, is_test=False, ve
                     required = self.opt_attrs(tag, context, ('machine', 'args',
                         'output', 'respawn', 'respawn_delay', 'cwd',
                         'launch-prefix', 'required'))
-            if tag.hasAttribute('machine') and not len(machine.strip()):
-                raise XmlParseException("<node> 'machine' must be non-empty: [%s]"%machine)
             if not machine and default_machine:
                 machine = default_machine.name
             # validate respawn, required

diff --git a/tools/roslaunch/test/unit/test_xmlloader.py b/tools/roslaunch/test/unit/test_xmlloader.py
@@ -757,7 +757,6 @@ def test_node_invalid(self):
                  'test-node-invalid-name-1.xml',
                  'test-node-invalid-name-2.xml',
                  'test-node-invalid-name-3.xml',
-                 'test-node-invalid-machine.xml',
                  'test-node-invalid-respawn.xml',
                  'test-node-invalid-respawn-required.xml',                 
                  'test-node-invalid-required-1.xml',

diff --git a/tools/roslaunch/test/xml/test-node-invalid-machine.xml b/tools/roslaunch/test/xml/test-node-invalid-machine.xml