<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18219">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">config: Allow setting trial directory in main.conf<br><br>Change-Id: Ia4141001d084f690897dbdff5eae6c69ff2e521c<br>---<br>M doc/manuals/chapters/config.adoc<br>M src/osmo-gsm-tester.py<br>M src/osmo_gsm_tester/core/config.py<br>3 files changed, 17 insertions(+), 6 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/19/18219/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/doc/manuals/chapters/config.adoc b/doc/manuals/chapters/config.adoc</span><br><span>index fec5c87..17cf825 100644</span><br><span>--- a/doc/manuals/chapters/config.adoc</span><br><span>+++ b/doc/manuals/chapters/config.adoc</span><br><span>@@ -27,6 +27,7 @@</span><br><span> </span><br><span> - 'state_dir': Path to <<state_dir,state_dir>> directory</span><br><span> - 'suites_dir': Path to <<suites_dir,suites_dir>> directory</span><br><span style="color: hsl(120, 100%, 40%);">+- 'trial_dir': Path to <<trials,trial>> directory to test against (overridden by cmdline argument)</span><br><span> - 'scenarios_dir': Path to <<scenarios_dir,scenarios_dir>> directory (optional)</span><br><span> - 'default_suites_conf_path': Path to <<default_suites_conf,default-suites.conf>> file (optional)</span><br><span> - 'defaults_conf_path': Path to <<defaults_conf,defaults.conf>> file (optional)</span><br><span>@@ -46,6 +47,7 @@</span><br><span> state_dir: '/var/tmp/osmo-gsm-tester/state'</span><br><span> suites_dir: '/usr/local/src/osmo-gsm-tester/suites'</span><br><span> scenarios_dir: './scenarios'</span><br><span style="color: hsl(120, 100%, 40%);">+trial_dir: './trial'</span><br><span> default_suites_conf_path: './default-suites.conf'</span><br><span> defaults_conf_path: './defaults.conf'</span><br><span> resource_conf_path: './resources.conf'</span><br><span>diff --git a/src/osmo-gsm-tester.py b/src/osmo-gsm-tester.py</span><br><span>index 204b1c7..cfe55f6 100755</span><br><span>--- a/src/osmo-gsm-tester.py</span><br><span>+++ b/src/osmo-gsm-tester.py</span><br><span>@@ -24,9 +24,9 @@</span><br><span> </span><br><span> Examples:</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-./osmo-gsm-tester.py -c doc/examples/2g_osmocom/main.conf ~/my_trial_package/ -s osmo_trx</span><br><span style="color: hsl(0, 100%, 40%);">-./osmo-gsm-tester.py -c doc/examples/2g_osmocom/main.conf ~/my_trial_package/ -s sms_tests:dyn_ts+eu_band+bts_sysmo</span><br><span style="color: hsl(0, 100%, 40%);">-./osmo-gsm-tester.py -c sysmocom/main.conf ~/my_trial_package/ -s sms_tests/mo_mt_sms:bts_trx</span><br><span style="color: hsl(120, 100%, 40%);">+./osmo-gsm-tester.py -c doc/examples/2g_osmocom/main.conf ~/my_trial_dir/ -s osmo_trx</span><br><span style="color: hsl(120, 100%, 40%);">+./osmo-gsm-tester.py -c doc/examples/2g_osmocom/main.conf ~/my_trial_dir/ -s sms_tests:dyn_ts+eu_band+bts_sysmo</span><br><span style="color: hsl(120, 100%, 40%);">+./osmo-gsm-tester.py -c sysmocom/main.conf ~/my_trial_dir/ -s sms_tests/mo_mt_sms:bts_trx</span><br><span> </span><br><span> (The names for test suites and scenarios used in these examples must be defined</span><br><span> by the osmo-gsm-tester configuration.)</span><br><span>@@ -104,7 +104,7 @@</span><br><span> help='Show version')</span><br><span> parser.add_argument('-c', '--conf-path', dest='conf_path',</span><br><span> help='''Specify main configuration file path''')</span><br><span style="color: hsl(0, 100%, 40%);">- parser.add_argument('trial_package',</span><br><span style="color: hsl(120, 100%, 40%);">+ parser.add_argument('trial_dir', nargs='?', default=None,</span><br><span> help='Directory containing binaries to test')</span><br><span> parser.add_argument('-s', '--suite-scenario', dest='suite_scenario', action='append',</span><br><span> help='''A suite-scenarios combination</span><br><span>@@ -129,7 +129,7 @@</span><br><span> exit(0)</span><br><span> </span><br><span> print('combinations:', repr(args.suite_scenario))</span><br><span style="color: hsl(0, 100%, 40%);">- print('trial:', repr(args.trial_package))</span><br><span style="color: hsl(120, 100%, 40%);">+ print('trial:', repr(args.trial_dir))</span><br><span> print('tests:', repr(args.test))</span><br><span> </span><br><span> # create a default log to stdout</span><br><span>@@ -144,6 +144,11 @@</span><br><span> if args.conf_path:</span><br><span> config.override_conf = args.conf_path</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if args.trial_dir is not None:</span><br><span style="color: hsl(120, 100%, 40%);">+ trial_dir = args.trial_dir</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ trial_dir = config.get_main_config_value(config.CFG_TRIAL_DIR)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> combination_strs = list(args.suite_scenario or [])</span><br><span> </span><br><span> if not combination_strs:</span><br><span>@@ -187,7 +192,7 @@</span><br><span> test_names = sorted(set(test_names))</span><br><span> print(repr(test_names))</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- with trial.Trial(args.trial_package) as current_trial:</span><br><span style="color: hsl(120, 100%, 40%);">+ with trial.Trial(trial_dir) as current_trial:</span><br><span> current_trial.verify()</span><br><span> for suite_scenario_str, suite_def, scenarios in suite_scenarios:</span><br><span> current_trial.add_suite_run(suite_scenario_str, suite_def, scenarios)</span><br><span>diff --git a/src/osmo_gsm_tester/core/config.py b/src/osmo_gsm_tester/core/config.py</span><br><span>index ea16e33..9380cca 100644</span><br><span>--- a/src/osmo_gsm_tester/core/config.py</span><br><span>+++ b/src/osmo_gsm_tester/core/config.py</span><br><span>@@ -65,6 +65,7 @@</span><br><span> CFG_STATE_DIR = 'state_dir'</span><br><span> CFG_SUITES_DIR = 'suites_dir'</span><br><span> CFG_SCENARIOS_DIR = 'scenarios_dir'</span><br><span style="color: hsl(120, 100%, 40%);">+CFG_TRIAL_DIR = 'trial_dir'</span><br><span> CFG_DEFAULT_SUITES_CONF = 'default_suites_conf_path'</span><br><span> CFG_DEFAULTS_CONF = 'defaults_conf_path'</span><br><span> CFG_RESOURCES_CONF = 'resource_conf_path'</span><br><span>@@ -72,6 +73,7 @@</span><br><span> CFG_STATE_DIR: schema.STR,</span><br><span> CFG_SUITES_DIR: schema.STR,</span><br><span> CFG_SCENARIOS_DIR: schema.STR,</span><br><span style="color: hsl(120, 100%, 40%);">+ CFG_TRIAL_DIR: schema.STR,</span><br><span> CFG_DEFAULT_SUITES_CONF: schema.STR,</span><br><span> CFG_DEFAULTS_CONF: schema.STR,</span><br><span> CFG_RESOURCES_CONF: schema.STR,</span><br><span>@@ -80,6 +82,7 @@</span><br><span> DF_CFG_STATE_DIR = '/var/tmp/osmo-gsm-tester/state/'</span><br><span> DF_CFG_SUITES_DIR = './suites'</span><br><span> DF_CFG_SCENARIOS_DIR = './scenarios'</span><br><span style="color: hsl(120, 100%, 40%);">+DF_CFG_TRIAL_DIR = './trial'</span><br><span> DF_CFG_DEFAULT_SUITES_CONF = './default-suites.conf'</span><br><span> DF_CFG_DEFAULTS_CONF = './defaults.conf'</span><br><span> DF_CFG_RESOURCES_CONF = './resources.conf'</span><br><span>@@ -133,6 +136,7 @@</span><br><span> CFG_STATE_DIR: DF_CFG_STATE_DIR,</span><br><span> CFG_SUITES_DIR: DF_CFG_SUITES_DIR,</span><br><span> CFG_SCENARIOS_DIR: DF_CFG_SCENARIOS_DIR,</span><br><span style="color: hsl(120, 100%, 40%);">+ CFG_TRIAL_DIR: DF_CFG_TRIAL_DIR,</span><br><span> CFG_DEFAULT_SUITES_CONF: DF_CFG_DEFAULT_SUITES_CONF,</span><br><span> CFG_DEFAULTS_CONF: DF_CFG_DEFAULTS_CONF,</span><br><span> CFG_RESOURCES_CONF: DF_CFG_RESOURCES_CONF,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18219">change 18219</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/c/osmo-gsm-tester/+/18219"/><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-Change-Id: Ia4141001d084f690897dbdff5eae6c69ff2e521c </div>
<div style="display:none"> Gerrit-Change-Number: 18219 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>