Fix up tests for new module structure

Signed-off-by: Emerson Knapp <[email protected]>

Author: emersonknapp

launch_frontend_py/__init__.py

@@ -25,7 +25,7 @@
 
 
 def launch(actions: List[Entity]) -> LaunchDescription:
-    """Entrypoint of the launchfile, produces a LaunchDescription containing the listed entities."""
+    """Entrypoint of launchfile, produce a LaunchDescription of the provided entities."""
     parser = Parser()
     root_entity = Entity('launch', children=actions)
     return parser.parse_description(root_entity)
@@ -69,13 +69,13 @@ def __getattr__(name: str) -> Any:
     elif name.endswith('_'):
         # The name has a trailing underscore, which we add to actions with reserved Python names
         # Try again without the underscore
-        __getattr__(name[:-1])
+        try:
+            return __getattr__(name[:-1])
+        except AttributeError as e:
+            raise AttributeError(f'{e} (or "{name}")')
     else:
         # It's not registered, raise the usual error
-        msg = f'module {__name__} has no attribute "{name}"'
-        if base_name != name:
-            msg += ' (or "{base_name}")'
-        raise AttributeError(msg)
+        raise AttributeError(f'module {__name__} has no attribute "{name}"')
 
 
 def __preseed_all_actions() -> None:
@@ -95,4 +95,5 @@ def __preseed_all_actions() -> None:
     for action_name in action_names:
         __getattr__(action_name)
 
+
 __preseed_all_actions()

launch_frontend_py/entity.py

@@ -14,8 +14,8 @@
 
 """Module for launch_frontend_py Entity class."""
 import builtins
-import keyword
 from collections.abc import Iterable
+import keyword
 from typing import (
     List,
     Optional,
@@ -53,7 +53,6 @@ def make_valid_name(name: str) -> str:
     return name
 
 
-
 class Entity(BaseEntity):
     """Single item in the intermediate front_end representation."""
 

test/test_action_list_preseed.py

@@ -20,4 +20,4 @@ def test_action_list_preseed():
     # already filled where possible without explicit access
     # picking a representative subset of actions (that are present in Humble+)
     for x in ['arg', 'timer', 'executable', 'let', 'group', 'include', 'set_env']:
-        assert x in launch_frontend_py.actions.__all__
+        assert x in launch_frontend_py.__all__

test/test_dynamic_attrs.py

@@ -14,7 +14,7 @@
 
 from launch.action import Action
 from launch.frontend import expose_action
-from launch_frontend_py import actions
+import launch_frontend_py as actions
 import pytest
 
 
@@ -32,27 +32,38 @@ def parse(cls, entity, parser):
 class DynamicCreationTest(Action):
     """Test action that exposes an action after first import."""
 
+    def __init__(self, value, **kwargs) -> None:
+        super().__init__(**kwargs)
+        self.value = value
+
     @classmethod
     def parse(cls, entity, parser):
         _, kwargs = super().parse(entity, parser)
+        kwargs['value'] = kwargs.get('value', None)
         return cls, kwargs
 
 
-def test_dynamic_attrs():
+def test_regular_action_load():
+    test_group = actions.group()
+    assert test_group.type_name == 'group'
+
+
+def test_dynamic_action_create():
     name = actions.let.__name__
     assert name == 'let'
     str_repr = str(actions.let)
     assert str_repr.startswith('<function let')
 
+
+def test_invalid_action_raise():
     with pytest.raises(AttributeError):
         getattr(actions, 'non_existent_action')
 
     with pytest.raises(AttributeError):
         _ = actions.other_nonexistent
 
-    test_group = actions.group()
-    assert test_group.type_name == 'group'
 
+def test_dynamic_attrs():
     test_arg = actions.arg(name='argname', default='argvalue')
     assert test_arg.type_name == 'arg'
     assert test_arg.get_attr('name') == 'argname'
@@ -64,14 +75,12 @@ def test_dynamic_attrs():
 
 def test_dynamic_create():
     assert actions.foo is not None
-
     assert actions.foo.__name__ == 'foo'
     assert actions.foo().type_name == 'foo'
-
-    with pytest.raises(AttributeError):
-        actions.node
+    x = actions.foo(value='bar')
+    assert x.get_attr('value') == 'bar'
 
 
-def test_bultin_suffix():
+def test_builtin_suffix():
     assert actions.while_.__name__ == 'while_'
     assert actions.while_().type_name == 'while_'