fix 6068:Make the test class dependencies fulfill all the tests.

The 'type' field is removed from the dependencies_dict (using
pop('type')), which causes the 'type' field to no longer exist in the
dictionary during subsequent operations.

The test updates are necessary because:

  1. tests now get executed because of this fix
  2. the JSON format needs to be escaped
  3. the number of tests and expected passes is really 1 because the
     test path given specifies a single test.

Signed-off-by: wangpeng <[email protected]>
Signed-off-by: Cleber Rosa <[email protected]>

Author: wangp-h

avocado/core/dependencies/dependency.py

@@ -58,7 +58,7 @@ def __eq__(self, other):
     @classmethod
     def from_dictionary(cls, dictionary):
         return cls(
-            dictionary.pop("type", None),
+            dictionary.get("type", None),
             dictionary.pop("uri", None),
             dictionary.pop("args", ()),
             dictionary,

selftests/functional/serial/requirements.py

@@ -131,11 +131,11 @@ def test_c(self):
 """
 
 DEPENDENCY_RECIPE_FMT = """
-{
+{{
   "kind": "avocado-instrumented",
   "uri": "{path}",
-  "kwargs": {"dependencies": [{"type": "package", "name": "hello"}]}
-}
+  "kwargs": {{"dependencies": [{{"type": "package", "name": "hello"}}]}}
+}}
 """
 
 
@@ -320,7 +320,7 @@ def test_dependency_recipe(self):
                 result = process.run(command, ignore_status=True)
                 self.assertEqual(result.exit_status, exit_codes.AVOCADO_ALL_OK)
                 self.assertIn(
-                    "PASS 3",
+                    "PASS 1",
                     result.stdout_text,
                 )
                 self.assertNotIn(