<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10624">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">suite: Fix generation of config() dictionary<br><br>suite.config() hasn't been activetly used anywere. New upcoming patches<br>will start using it to set and overlay config parameters for objects<br>which are not necessarily allocated as resources.<br><br>Since these options don't apply to specific resources, there's no sense<br>in running replicate_times() on them.<br><br>Change-Id: I5fcdc9151d1663e738f5c8abe588a42ab51c8f6e<br>---<br>M src/osmo_gsm_tester/suite.py<br>1 file changed, 8 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/24/10624/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/suite.py b/src/osmo_gsm_tester/suite.py</span><br><span>index fa86f96..3a49574 100644</span><br><span>--- a/src/osmo_gsm_tester/suite.py</span><br><span>+++ b/src/osmo_gsm_tester/suite.py</span><br><span>@@ -126,14 +126,18 @@</span><br><span>         self.duration = 0</span><br><span>         self.status = SuiteRun.UNKNOWN</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    def combined(self, conf_name):</span><br><span style="color: hsl(120, 100%, 40%);">+    def combined(self, conf_name, replicate_times=True):</span><br><span>         log.dbg(combining=conf_name)</span><br><span>         log.ctx(combining_scenarios=conf_name)</span><br><span style="color: hsl(0, 100%, 40%);">-        combination = config.replicate_times(self.definition.conf.get(conf_name, {}))</span><br><span style="color: hsl(120, 100%, 40%);">+        combination = self.definition.conf.get(conf_name, {})</span><br><span style="color: hsl(120, 100%, 40%);">+        if replicate_times:</span><br><span style="color: hsl(120, 100%, 40%);">+            combination = config.replicate_times(combination)</span><br><span>         log.dbg(definition_conf=combination)</span><br><span>         for scenario in self.scenarios:</span><br><span>             log.ctx(combining_scenarios=conf_name, scenario=scenario.name())</span><br><span style="color: hsl(0, 100%, 40%);">-            c = config.replicate_times(scenario.get(conf_name, {}))</span><br><span style="color: hsl(120, 100%, 40%);">+            c = scenario.get(conf_name, {})</span><br><span style="color: hsl(120, 100%, 40%);">+            if replicate_times:</span><br><span style="color: hsl(120, 100%, 40%);">+                c = config.replicate_times(c)</span><br><span>             log.dbg(scenario=scenario.name(), conf=c)</span><br><span>             if c is None:</span><br><span>                 continue</span><br><span>@@ -162,7 +166,7 @@</span><br><span> </span><br><span>     def config(self):</span><br><span>         if self._config is None:</span><br><span style="color: hsl(0, 100%, 40%);">-            self._config = self.combined('config')</span><br><span style="color: hsl(120, 100%, 40%);">+            self._config = self.combined('config', False)</span><br><span>         return self._config</span><br><span> </span><br><span>     def reserve_resources(self):</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10624">change 10624</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/10624"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-gsm-tester </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I5fcdc9151d1663e738f5c8abe588a42ab51c8f6e </div>
<div style="display:none"> Gerrit-Change-Number: 10624 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>