<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/24349">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">execute unit tests via nose from "setup.py test"<br><br>Change-Id: I8b2205b2c4e31f4ca64d0e48f8073799c61c29c7<br>---<br>M contrib/jenkins.sh<br>R pySim/tests/test_utils.py<br>M setup.py<br>3 files changed, 5 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/49/24349/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh</span><br><span>index 27f0245..11d5b1e 100755</span><br><span>--- a/contrib/jenkins.sh</span><br><span>+++ b/contrib/jenkins.sh</span><br><span>@@ -24,9 +24,10 @@</span><br><span> pip install construct</span><br><span> pip install bidict</span><br><span> pip install gsm0338</span><br><span style="color: hsl(120, 100%, 40%);">+pip install nose</span><br><span> </span><br><span> # Execute automatically discovered unit tests first</span><br><span style="color: hsl(0, 100%, 40%);">-python -m unittest discover -v -s tests/</span><br><span style="color: hsl(120, 100%, 40%);">+python -m ./setup.py test</span><br><span> </span><br><span> # Run pylint to find potential errors</span><br><span> # Ignore E1102: not-callable</span><br><span>diff --git a/tests/test_utils.py b/pySim/tests/test_utils.py</span><br><span>old mode 100755</span><br><span>new mode 100644</span><br><span>similarity index 98%</span><br><span>rename from tests/test_utils.py</span><br><span>rename to pySim/tests/test_utils.py</span><br><span>index 17a9300..899f391</span><br><span>--- a/tests/test_utils.py</span><br><span>+++ b/pySim/tests/test_utils.py</span><br><span>@@ -1,5 +1,3 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#!/usr/bin/env python3</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> import unittest</span><br><span> from pySim import utils</span><br><span> from pySim.ts_31_102 import EF_SUCI_Calc_Info</span><br><span>@@ -179,6 +177,3 @@</span><br><span>         res = utils.bertlv_parse_one(b'\x81\x01\x01');</span><br><span>         self.assertEqual(res, ({'tag':1, 'constructed':False, 'class':2}, 1, b'\x01', b''))</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-if __name__ == "__main__":</span><br><span style="color: hsl(0, 100%, 40%);">-       unittest.main()</span><br><span>diff --git a/setup.py b/setup.py</span><br><span>index 2ef498f..37129b8 100644</span><br><span>--- a/setup.py</span><br><span>+++ b/setup.py</span><br><span>@@ -22,5 +22,7 @@</span><br><span>         'pySim-prog.py',</span><br><span>         'pySim-read.py',</span><br><span>         'pySim-shell.py'</span><br><span style="color: hsl(0, 100%, 40%);">-    ]</span><br><span style="color: hsl(120, 100%, 40%);">+    ],</span><br><span style="color: hsl(120, 100%, 40%);">+    test_suite='nose.collector',</span><br><span style="color: hsl(120, 100%, 40%);">+    tests_require=['nose'],</span><br><span> )</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/24349">change 24349</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/pysim/+/24349"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: pysim </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I8b2205b2c4e31f4ca64d0e48f8073799c61c29c7 </div>
<div style="display:none"> Gerrit-Change-Number: 24349 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>