REQREPLY-221: Apply PR feedback

Author: albertorobles2000

tests/examples/connext_dds/dynamic_data_nested_structs/java/DynamicDataNestedStruct.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
-cd /test/connextdds_examples_suite/rticonnextdds-examples/examples/connext_dds/dynamic_data_nested_structs/java
+cd ${BaseExamplePath}/java
 java -Djava.library.path=$NDDSHOME/lib/x64Linux4gcc7.3.0 -cp ".:$NDDSHOME/lib/java/nddsjava.jar" DynamicDataNestedStruct $@

tests/examples/connext_dds/remote_procedure_call/c++11/Inventory_client.sh

@@ -3,5 +3,5 @@
 # Change directory to the location of the example working directory
 # to workaround DIT-193
 
-cd /test/connextdds_examples_suite/rticonnextdds-examples/examples/connext_dds/remote_procedure_call/c++11
+cd ${BaseExamplePath}/c++11
 ./build/Inventory_client $@

tests/examples/connext_dds/remote_procedure_call/c++11/Inventory_service.sh

@@ -3,5 +3,5 @@
 # Change directory to the location of the example working directory
 # to workaround DIT-193
 
-cd /test/connextdds_examples_suite/rticonnextdds-examples/examples/connext_dds/remote_procedure_call/c++11
+cd ${BaseExamplePath}/c++11
 ./build/Inventory_service $@

tests/examples/connext_dds/remote_procedure_call/py/inventory_client.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 
-cd /test/connextdds_examples_suite/rticonnextdds-examples/examples/connext_dds/remote_procedure_call/py
+cd ${BaseExamplePath}/py
 /bin/python3 inventory_client.py $@
 rm -rf __pycache__

tests/examples/connext_dds/remote_procedure_call/py/inventory_service.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 
-cd /test/connextdds_examples_suite/rticonnextdds-examples/examples/connext_dds/remote_procedure_call/py
+cd ${BaseExamplePath}/py
 /bin/python3 inventory_service.py $@
 rm -rf __pycache__

tests/examples/connext_dds/request_reply/cs/PrimesReplier.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
-cd /test/connextdds_examples_suite/rticonnextdds-examples/examples/connext_dds/request_reply/cs
+cd ${BaseExamplePath}/cs
 /usr/bin/dotnet run -- --replier $@

tests/examples/connext_dds/request_reply/cs/PrimesRequester.sh

@@ -5,5 +5,5 @@
 # to try to avoid the issue
 sleep 10
 
-cd /test/connextdds_examples_suite/rticonnextdds-examples/examples/connext_dds/request_reply/cs
+cd ${BaseExamplePath}/cs
 /usr/bin/dotnet run -- --requester $@

tests/examples/connext_dds/request_reply/py/primes_replier.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 
-cd /test/connextdds_examples_suite/rticonnextdds-examples/examples/connext_dds/request_reply/py
+cd ${BaseExamplePath}/py
 /bin/python3 primes_replier.py $@
 rm -rf __pycache__

tests/examples/connext_dds/request_reply/py/primes_requester.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 
-cd /test/connextdds_examples_suite/rticonnextdds-examples/examples/connext_dds/request_reply/py
+cd ${BaseExamplePath}/py
 /bin/python3 primes_requester.py $@
 rm -rf __pycache__

tutorials/rpc/py/robot_client.py

@@ -20,17 +20,12 @@ class RobotControlClient(RobotControl, rpc.ClientBase):
     pass
 
 
-async def wait_for_service(client: RobotControlClient):
-    while client.matched_service_count == 0:
-        await sleep(0.1)
-
-
 async def main():
     participant = dds.DomainParticipant(domain_id=0)
     client = RobotControlClient(participant, "MyRobotControl")
 
     # For versions 7.4.0 and below:
-    await wait_for_service(client)
+    sleep(2)
     # For newer versions you can use the following:
     # await client.wait_for_service_async(dds.Duration(20))