Merging pull request 2572

Signed-off-by: NLukáš Doktor <ldoktor@redhat.com>

* https://github.com/avocado-framework/avocado:
  example/tets/gdbtest.py: do not require trailing newlines
  avocado/utils/external/gdbmi_parser.py: "type" parameter left behind

avocado/utils/external/gdbmi_parser.py

@@ -171,7 +171,7 @@ def __private():
             exclude = [
                 'record_list'
             ]
-            if len(args) == 1 and type not in exclude:
+            if len(args) == 1 and token_type not in exclude:
                 return args[0]
             return spark.GenericASTBuilder.nonterminal(self, token_type, args)
 

examples/tests/gdbtest.py

@@ -360,7 +360,7 @@ class GdbTest(Test):
         self.assertTrue(os.path.exists(s.stderr_path))
 
         stderr_lines = genio.read_all_lines(s.stderr_path)
-        listening_line = "Listening on port %s\n" % s.port
+        listening_line = "Listening on port %s" % s.port
         self.assertIn(listening_line, stderr_lines)
 
     def test_server_stdout(self):
@@ -376,7 +376,7 @@ class GdbTest(Test):
         self.assertTrue(os.path.exists(s.stderr_path))
 
         stdout_lines = genio.read_all_lines(s.stdout_path)
-        self.assertIn("return 99\n", stdout_lines)
+        self.assertIn("return 99", stdout_lines)
 
     def test_interactive_stdout(self):
         """