Merge branch 'topic/stabilize_dap_tests' into 'master'

Stabilize DAP tests

See merge request eng/ide/gnatstudio!477

Author: AnthonyLeonardoGracio

testsuite/tests/dap.V711-016.arguments/test.py

@@ -2,10 +2,10 @@
 from GPS import *
 from gs_utils.internal.utils import *
 
-expected_values = ([['0', 'false']])
+expected_values = (['', ['0', 'false']])
 expected_names = (['<b>Arguments</b>', ['<b>i</b>', '<b>b</b>']])
 
-expected_values_1 = ([['0', 'false'],'5'])
+expected_values_1 = (['', ['0', 'false'], '5'])
 expected_names_1 = (['<b>Arguments</b>', ['<b>i</b>', '<b>b</b>'], '<b>arguments</b>'])
 
 @run_test_driver
@@ -31,7 +31,6 @@ def run_test():
     yield wait_DAP_server("variables")
     yield wait_until_not_busy(debug)
     yield wait_idle()
-
     tree = get_widget_by_name("Variables Tree")
     dump = dump_tree_model(tree.get_model(), 1)
     gps_assert(dump, expected_values)

testsuite/tests/dap.parsing_ada/test.py

@@ -52,7 +52,9 @@ def get_children(var):
 
 @run_test_driver
 def test_driver():
-    yield wait_tasks()
+    # Wait for the DAP server to give us the sources of
+    # the debugged executable.
+    yield wait_DAP_server('loadedSources')
 
     p = promises.DebuggerWrapper(GPS.File("parse"))
     debug = GPS.Debugger.get()

testsuite/tests/dap.parsing_c/test.py

@@ -53,7 +53,9 @@ def check_simple(debug, name, type, value, description,
 
 @run_test_driver
 def test_driver():
-    yield wait_tasks(other_than=known_tasks)
+    # Wait for the DAP server to give us the sources of
+    # the debugged executable.
+    yield wait_DAP_server('loadedSources')
 
     p = promises.DebuggerWrapper(GPS.File("parse_c"))
     debug = GPS.Debugger.get()

testsuite/tests/dap.parsing_cpp/test.py

@@ -38,7 +38,7 @@ def check(promise, name, type, value, pattern=False):
             simple_error(name + " is None")
         else:
             check_variable(var.data, name, type, value, pattern)
-        
+
     elif var.is_error:
         simple_error(name + " error:" + var.error_message)
 
@@ -53,7 +53,9 @@ def check_simple(debug, name, type, value, description,
 
 @run_test_driver
 def test_driver():
-    yield wait_tasks(other_than=known_tasks)
+    # Wait for the DAP server to give us the sources of
+    # the debugged executable.
+    yield wait_DAP_server('loadedSources')
 
     p = promises.DebuggerWrapper(GPS.File("parse_cpp"))
     debug = GPS.Debugger.get()