Merge branch 'erodrigu-dv-exe-pytest-1' into 'master'

Add test of override_data_options option set in random order

See merge request !611

DaVinciSys/tests/test_davinci_script.py

@@ -46,3 +46,24 @@ def test_override_job_option():
                    for line in f.readlines())
 
     os.remove("test_override_job_option.opts")
+
+
+def test_override_job_option_bis():
+    """
+    Verify the overriding of a DaVinci option on the fly,
+    no matter the order of the --override_data_options option
+    (see related test "test_override_job_option").
+    No need to actually run the job, hence the dry run.
+    """
+    cmd = 'davinci --export test_override_job_option_bis.opts --dry-run run-mc  --unpack_stream "/Event/Unknown" --override_data_options True --inputfiledb Upgrade_Bd2KstarMuMu -'
+    result = subprocess.run(cmd, shell=True)
+
+    # Just be maniac - the command should work ;-)
+    assert result.returncode == 0
+
+    # Inspect the produced .opts file and check for the option value overridden
+    with open("test_override_job_option_bis.opts") as f:
+        assert any('.unpack_stream = "/Event/Unknown";' in line
+                   for line in f.readlines())
+
+    os.remove("test_override_job_option_bis.opts")