fixed gef-remote from tests, using only target remote

Author: hugsy

tests/api/gef_memory.py

@@ -12,6 +12,7 @@
     ARCH,
     debug_target,
     gdbserver_session,
+    get_random_port,
     qemuuser_session,
     GDBSERVER_DEFAULT_HOST,
 )
@@ -121,48 +122,35 @@ def test_func_parse_maps_local_procfs(self):
     @pytest.mark.slow
     def test_func_parse_maps_remote_gdbserver(self):
         gef, gdb = self._gef, self._gdb
-        # When in a gef-remote session `parse_gdb_info_proc_maps` should work to
+        # When in a remote session `parse_gdb_info_proc_maps` should work to
         # query the memory maps
-        while True:
-            port = random.randint(1025, 65535)
-            if port != self._port:
-                break
+        port = get_random_port()
 
         with pytest.raises(Exception):
-            gdb.execute(f"gef-remote {GDBSERVER_DEFAULT_HOST} {port}")
+            gdb.execute(f"target remote :{port}")
 
         with gdbserver_session(port=port) as _:
-            gdb.execute(f"gef-remote {GDBSERVER_DEFAULT_HOST} {port}")
+            gdb.execute(f"target remote :{port}")
             sections = gef.memory.maps
             assert len(sections) > 0
 
     @pytest.mark.skipif(ARCH not in ("x86_64",), reason=f"Skipped for {ARCH}")
     def test_func_parse_maps_remote_qemu(self):
         gdb, gef = self._gdb, self._gef
-        # When in a gef-remote qemu-user session `parse_gdb_info_proc_maps`
-        # should work to query the memory maps
-        while True:
-            port = random.randint(1025, 65535)
-            if port != self._port:
-                break
+        port = get_random_port()
 
         with qemuuser_session(port=port) as _:
-            cmd = f"gef-remote --qemu-user --qemu-binary {self._target} {GDBSERVER_DEFAULT_HOST} {port}"
+            cmd = f"target remote :{port}"
             gdb.execute(cmd)
             sections = gef.memory.maps
             assert len(sections) > 0
 
     def test_func_parse_maps_realpath(self):
         gef, gdb = self._gef, self._gdb
-        # When in a gef-remote session `parse_gdb_info_proc_maps` should work to
-        # query the memory maps
-        while True:
-            port = random.randint(1025, 65535)
-            if port != self._port:
-                break
+        port = get_random_port()
 
         with gdbserver_session(port=port) as _:
-            gdb.execute(f"gef-remote {GDBSERVER_DEFAULT_HOST} {port}")
+            gdb.execute(f"target remote :{port}")
             gdb.execute("b main")
             gdb.execute("continue")
             sections = gef.memory.maps

tests/api/gef_session.py

@@ -14,6 +14,7 @@
     ARCH,
     debug_target,
     gdbserver_session,
+    get_random_port,
     qemuuser_session,
     GDBSERVER_DEFAULT_HOST,
 )
@@ -63,12 +64,11 @@ def test_root_dir_local(self):
     def test_root_dir_remote(self):
         gdb = self._gdb
         gdb.execute("start")
-
         expected = os.stat("/")
-        host = GDBSERVER_DEFAULT_HOST
-        port = random.randint(1025, 65535)
+        port = get_random_port()
+
         with gdbserver_session(port=port):
-            gdb.execute(f"gef-remote {host} {port}")
+            gdb.execute(f"target remote :{port}")
             result = self._conn.root.eval("os.stat(gef.session.root)")
             assert (expected.st_dev == result.st_dev) and (
                 expected.st_ino == result.st_ino
@@ -77,11 +77,8 @@ def test_root_dir_remote(self):
     @pytest.mark.skipif(ARCH not in ("x86_64",), reason=f"Skipped for {ARCH}")
     def test_root_dir_qemu(self):
         gdb, gef = self._gdb, self._gef
+        port = get_random_port()
 
-        host = GDBSERVER_DEFAULT_HOST
-        port = random.randint(1025, 65535)
         with qemuuser_session(port=port):
-            gdb.execute(
-                f"gef-remote --qemu-user --qemu-binary {self._target} {host} {port}"
-            )
+            gdb.execute(f"target remote :{port}")
             assert re.search(r"\/proc\/[0-9]+/root", str(gef.session.root))

tests/regressions/gdbserver_connection.py

@@ -10,8 +10,8 @@ def test_can_establish_connection_to_gdbserver_again_after_disconnect(self):
         gdb = self._gdb
 
         with gdbserver_session(port=5001) as _, gdbserver_session(port=5002) as _:
-            gdb.execute("gef-remote 127.0.0.1 5001")
+            gdb.execute("target remote :5001")
             gdb.execute("detach")
 
-            gdb.execute("gef-remote 127.0.0.1 5002")
+            gdb.execute("target remote :5002")
             gdb.execute("continue")