summaryrefslogtreecommitdiff
path: root/validation/test/P2P_throughput
diff options
context:
space:
mode:
authorJean-Philippe NOEL2013-04-23 13:49:25 +0200
committerJean-Philippe NOEL2013-05-24 10:12:33 +0200
commitb755016a4740dbf7b7e59911e17f43b1ce8140cc (patch)
tree3d5d66b3505cc95aedac218bc88b5591ee39c3d4 /validation/test/P2P_throughput
parentd98f612c3b18f1e90bda7b20850808b7b4e337b8 (diff)
validation: possibility to define a parent configuration, refs #4001
Diffstat (limited to 'validation/test/P2P_throughput')
-rw-r--r--validation/test/P2P_throughput/config.py4
-rw-r--r--validation/test/P2P_throughput/configs/MCR500_eoc.py1
-rw-r--r--validation/test/P2P_throughput/configs/MPR520_av.py1
-rw-r--r--validation/test/P2P_throughput/configs/SPK300g_eoc.py1
4 files changed, 7 insertions, 0 deletions
diff --git a/validation/test/P2P_throughput/config.py b/validation/test/P2P_throughput/config.py
index 31f5b3ff5c..06f1bc6b01 100644
--- a/validation/test/P2P_throughput/config.py
+++ b/validation/test/P2P_throughput/config.py
@@ -1,4 +1,8 @@
{
+ # Parent configuration file, which will be overriden by the current
+ # configuration - The path of the parent is relative to the current
+ # configuration file
+ "parent":None,
# True|False
# If True, the plugs are restarted before each serie of measurements
# If False, the plugs are not restarted before a serie of measurements
diff --git a/validation/test/P2P_throughput/configs/MCR500_eoc.py b/validation/test/P2P_throughput/configs/MCR500_eoc.py
index f586d34613..3cdc68b31d 100644
--- a/validation/test/P2P_throughput/configs/MCR500_eoc.py
+++ b/validation/test/P2P_throughput/configs/MCR500_eoc.py
@@ -1,4 +1,5 @@
{
+ "parent":None,
"restart_plugs":False,
"get_CE_stats":False,
"displayed_CE_stats":[],
diff --git a/validation/test/P2P_throughput/configs/MPR520_av.py b/validation/test/P2P_throughput/configs/MPR520_av.py
index eca6c80b7e..a6ccd76d43 100644
--- a/validation/test/P2P_throughput/configs/MPR520_av.py
+++ b/validation/test/P2P_throughput/configs/MPR520_av.py
@@ -1,4 +1,5 @@
{
+ "parent":None,
"restart_plugs":False,
"get_CE_stats":False,
"displayed_CE_stats":[],
diff --git a/validation/test/P2P_throughput/configs/SPK300g_eoc.py b/validation/test/P2P_throughput/configs/SPK300g_eoc.py
index b5db312448..2fce5e733e 100644
--- a/validation/test/P2P_throughput/configs/SPK300g_eoc.py
+++ b/validation/test/P2P_throughput/configs/SPK300g_eoc.py
@@ -1,4 +1,5 @@
{
+ "parent":None,
"restart_plugs":False,
"get_CE_stats":False,
"displayed_CE_stats":[],