tests: Simplify command and entrypoint normalization tests

Signed-off-by: Povilas Kanapickas <povilas@radix.lt>

pytests/test_can_merge_cmd_ent.py

@@ -17,22 +17,24 @@ test_keys = ["command", "entrypoint"]
 
 class TestCanMergeCmdEnt(unittest.TestCase):
     @parameterized.expand([
-        ({"$$$": []}, {"$$$": []}),
+        ([], []),
-        ({"$$$": ["sh"]}, {"$$$": ["sh"]}),
+        (["sh"], ["sh"]),
-        ({"$$$": ["sh", "-c", "date"]}, {"$$$": ["sh", "-c", "date"]}),
+        (["sh", "-c", "date"], ["sh", "-c", "date"]),
-        ({"$$$": "sh"}, {"$$$": ["sh"]}),
+        ("sh", ["sh"]),
-        ({"$$$": "sleep infinity"}, {"$$$": ["sleep", "infinity"]}),
+        ("sleep infinity", ["sleep", "infinity"]),
         (
-            {"$$$": "bash -c 'sleep infinity'"},
+            "bash -c 'sleep infinity'",
-            {"$$$": ["bash", "-c", "sleep infinity"]},
+            ["bash", "-c", "sleep infinity"],
         ),
     ])
-    def test_normalize_service(self, input_template, expected_template):
+    def test_command_like(self, input, expected):
-        for key in test_keys:
+        for key in ['command', 'entrypoint']:
-            test_input, _, expected = template_to_expression(
+            input_service = {}
-                input_template, {}, expected_template, key
+            input_service[key] = input
-            )
+
-            self.assertEqual(normalize_service(test_input), expected)
+            expected_service = {}
+            expected_service[key] = expected
+            self.assertEqual(normalize_service(input_service), expected_service)
 
     @parameterized.expand([
         ({}, {"$$$": []}, {"$$$": []}),