<p>Holger Freyther has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11598">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ms_driver: use the util.Dir and create one dir per instance<br><br>Change-Id: Ie0f2fe99f6a6640606eb4e69fb1a2d22eae9b2c8<br>---<br>M src/osmo_gsm_tester/ms_driver.py<br>M src/osmo_ms_driver/__main__.py<br>M src/osmo_ms_driver/starter.py<br>3 files changed, 7 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/98/11598/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/ms_driver.py b/src/osmo_gsm_tester/ms_driver.py</span><br><span>index f46efa3..f9ad559 100644</span><br><span>--- a/src/osmo_gsm_tester/ms_driver.py</span><br><span>+++ b/src/osmo_gsm_tester/ms_driver.py</span><br><span>@@ -16,7 +16,7 @@</span><br><span> # along with this program.  If not, see <http://www.gnu.org/licenses/>.</span><br><span> </span><br><span> from datetime import timedelta</span><br><span style="color: hsl(0, 100%, 40%);">-from . import log</span><br><span style="color: hsl(120, 100%, 40%);">+from . import log, util</span><br><span> from osmo_ms_driver.cdf import cdfs</span><br><span> from osmo_ms_driver.event_server import EventServer</span><br><span> from osmo_ms_driver.simple_loop import SimpleLoop</span><br><span>@@ -85,7 +85,8 @@</span><br><span>         self._ev_server.listen(self._loop)</span><br><span>         options = BinaryOptions("virtphy", "mobile", None)</span><br><span>         self._test_case = MassUpdateLocationTest("mass", options, self._num_ms, self._cdf,</span><br><span style="color: hsl(0, 100%, 40%);">-                                                 self._ev_server, self.event_server_sk_tmp_dir)</span><br><span style="color: hsl(120, 100%, 40%);">+                                                 self._ev_server,</span><br><span style="color: hsl(120, 100%, 40%);">+                                                 util.Dir(self.event_server_sk_tmp_dir))</span><br><span> </span><br><span>         # TODO: We should pass subscribers down to the test and not get it from</span><br><span>         # there.</span><br><span>diff --git a/src/osmo_ms_driver/__main__.py b/src/osmo_ms_driver/__main__.py</span><br><span>index 0e3611b..7e1afa8 100644</span><br><span>--- a/src/osmo_ms_driver/__main__.py</span><br><span>+++ b/src/osmo_ms_driver/__main__.py</span><br><span>@@ -21,7 +21,7 @@</span><br><span> from .location_update_test import MassUpdateLocationTest</span><br><span> from .cdf import cdfs</span><br><span> from .starter import BinaryOptions</span><br><span style="color: hsl(0, 100%, 40%);">-from osmo_gsm_tester import log</span><br><span style="color: hsl(120, 100%, 40%);">+from osmo_gsm_tester import log, util</span><br><span> </span><br><span> # System modules</span><br><span> from datetime import timedelta</span><br><span>@@ -64,7 +64,7 @@</span><br><span> </span><br><span>     loop = SimpleLoop()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    tmp_dir = tempfile.mkdtemp(suffix="osmo-ms-driver")</span><br><span style="color: hsl(120, 100%, 40%);">+    tmp_dir = util.Dir(tempfile.mkdtemp(suffix="osmo-ms-driver"))</span><br><span>     log.log("Going to store files in ", tmp_dir=tmp_dir)</span><br><span> </span><br><span>     # How long should starting all apps take</span><br><span>@@ -73,7 +73,7 @@</span><br><span>     time_step=datetime.timedelta(milliseconds=args.launch_interval)</span><br><span> </span><br><span>     # Event server path</span><br><span style="color: hsl(0, 100%, 40%);">-    event_server_path = os.path.join(tmp_dir,  "osmo_ms_driver.unix")</span><br><span style="color: hsl(120, 100%, 40%);">+    event_server_path = os.path.join(str(tmp_dir),  "osmo_ms_driver.unix")</span><br><span> </span><br><span>     # The function that decides when to start something</span><br><span>     cdf = cdfs[args.cdf_name](time_start, time_step)</span><br><span>diff --git a/src/osmo_ms_driver/starter.py b/src/osmo_ms_driver/starter.py</span><br><span>index 4611cd6..a24d0c6 100644</span><br><span>--- a/src/osmo_ms_driver/starter.py</span><br><span>+++ b/src/osmo_ms_driver/starter.py</span><br><span>@@ -31,7 +31,7 @@</span><br><span>         self._binary = binary</span><br><span>         self._env = env</span><br><span>         self._name_number = name_number</span><br><span style="color: hsl(0, 100%, 40%);">-        self._tmp_dir = tmp_dir</span><br><span style="color: hsl(120, 100%, 40%);">+        self._tmp_dir = tmp_dir.new_dir(self.name())</span><br><span> </span><br><span>     def name_number(self):</span><br><span>         return self._name_number</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11598">change 11598</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/11598"/><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: Ie0f2fe99f6a6640606eb4e69fb1a2d22eae9b2c8 </div>
<div style="display:none"> Gerrit-Change-Number: 11598 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Holger Freyther <holger@freyther.de> </div>