From 372d853982706c5d00aa0e6063bab6fff322cc66 Mon Sep 17 00:00:00 2001
From: Susie Murphy <susie.murphy@epfl.ch>
Date: Tue, 8 Jan 2019 15:10:41 +0000
Subject: [PATCH] Merged in remove_brain_reset (pull request #6)
[NRRPLT-7166] Remove brain reset
Approved-by: Kepa Cantero <cantero@fortiss.org>
---
examples/integration_test/it.py | 8 +-------
hbp_nrp_virtual_coach/hbp_nrp_virtual_coach/config.py | 2 +-
hbp_nrp_virtual_coach/hbp_nrp_virtual_coach/simulation.py | 2 +-
3 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/examples/integration_test/it.py b/examples/integration_test/it.py
index 6929aec..3c7392f 100644
--- a/examples/integration_test/it.py
+++ b/examples/integration_test/it.py
@@ -110,7 +110,7 @@ def run(oidc_username, storage_username):
# running array of test case results, unfortunately we have to hardcode the number of
# test cases because the indeterminate progress bar is not helpful for the tester
- NUM_TEST_CASES = 29
+ NUM_TEST_CASES = 28
results = TestCases(NUM_TEST_CASES)
try:
@@ -421,12 +421,6 @@ def tf(t):
sim.start()
results.done(True)
- results.start('Resetting Brain')
- sim.reset('brain')
- wait_condition(5, 'Waiting for simulation to pause.', lambda x: x['state'] == 'paused')
- sim.start()
- results.done(True)
-
##
## Shutdown, Cleanup and Delete the cloned experiment used in the tests
##
diff --git a/hbp_nrp_virtual_coach/hbp_nrp_virtual_coach/config.py b/hbp_nrp_virtual_coach/hbp_nrp_virtual_coach/config.py
index af7d79d..7295a03 100644
--- a/hbp_nrp_virtual_coach/hbp_nrp_virtual_coach/config.py
+++ b/hbp_nrp_virtual_coach/hbp_nrp_virtual_coach/config.py
@@ -89,7 +89,7 @@ class Config(dict):
self.__validate('simulation-services', ['create', 'state', 'reset'])
self.__validate('simulation-scripts', ['state-machine', 'transfer-function', 'brain',
'sdf-world'])
- self.__validate('reset-services', ['robot_pose', 'full', 'world', 'brain'])
+ self.__validate('reset-services', ['robot_pose', 'full', 'world'])
self.__validate('ros', ['status', 'error'])
# convenience, prepend the proxy url to all proxy services, we cannot do this
diff --git a/hbp_nrp_virtual_coach/hbp_nrp_virtual_coach/simulation.py b/hbp_nrp_virtual_coach/hbp_nrp_virtual_coach/simulation.py
index dd06bc4..0a05886 100644
--- a/hbp_nrp_virtual_coach/hbp_nrp_virtual_coach/simulation.py
+++ b/hbp_nrp_virtual_coach/hbp_nrp_virtual_coach/simulation.py
@@ -743,7 +743,7 @@ class Simulation(object):
simulation.
:param reset_type: The reset type the user wants to be performed. Possible values are full,
- robot_pose, world, brain. The possible reset types are stored in the
+ robot_pose and world. The possible reset types are stored in the
config file.
"""
--
GitLab