<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/16564">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Fix automated tests<br><br>- The .ok files currently dictate in which pysical reader device the<br>card must be placed. Lets remove this dependncy to make the setup more<br>reliable. Testing in which reade a card is placed is not in the scope of<br>our tests.<br><br>- Fix bug in pysim-test.sh (test runner), so that the veriable $ADM_HEX<br>gets reset after the execution of the tests.<br><br>Change-Id: I12e6b46787efb39c5745f4e7f3cdcca9209881b8<br>---<br>M pysim-testdata/Fairwaves-SIM.ok<br>M pysim-testdata/Wavemobile-SIM.ok<br>M pysim-testdata/fakemagicsim.ok<br>M pysim-testdata/sysmoUSIM-SJS1.ok<br>M pysim-testdata/sysmosim-gr1.ok<br>M tests/pysim-test.sh<br>6 files changed, 11 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pysim-testdata/Fairwaves-SIM.ok b/pysim-testdata/Fairwaves-SIM.ok</span><br><span>index 7f60765..6150469 100644</span><br><span>--- a/pysim-testdata/Fairwaves-SIM.ok</span><br><span>+++ b/pysim-testdata/Fairwaves-SIM.ok</span><br><span>@@ -1,4 +1,4 @@</span><br><span style="color: hsl(0, 100%, 40%);">-Using PC/SC reader (dev=4) interface</span><br><span style="color: hsl(120, 100%, 40%);">+Using PC/SC reader (dev=0) interface</span><br><span> Reading ...</span><br><span> ICCID: 8988219000000117833</span><br><span> IMSI: 001010000000111</span><br><span>diff --git a/pysim-testdata/Wavemobile-SIM.ok b/pysim-testdata/Wavemobile-SIM.ok</span><br><span>index 5f5b360..b0ea8be 100644</span><br><span>--- a/pysim-testdata/Wavemobile-SIM.ok</span><br><span>+++ b/pysim-testdata/Wavemobile-SIM.ok</span><br><span>@@ -1,4 +1,4 @@</span><br><span style="color: hsl(0, 100%, 40%);">-Using PC/SC reader (dev=3) interface</span><br><span style="color: hsl(120, 100%, 40%);">+Using PC/SC reader (dev=4) interface</span><br><span> Reading ...</span><br><span> ICCID: 89445310150011013678</span><br><span> IMSI: 001010000000102</span><br><span>diff --git a/pysim-testdata/fakemagicsim.ok b/pysim-testdata/fakemagicsim.ok</span><br><span>index a1d9e9c..d9bff94 100644</span><br><span>--- a/pysim-testdata/fakemagicsim.ok</span><br><span>+++ b/pysim-testdata/fakemagicsim.ok</span><br><span>@@ -1,4 +1,4 @@</span><br><span style="color: hsl(0, 100%, 40%);">-Using PC/SC reader (dev=1) interface</span><br><span style="color: hsl(120, 100%, 40%);">+Using PC/SC reader (dev=2) interface</span><br><span> Reading ...</span><br><span> ICCID: 1122334455667788990</span><br><span> IMSI: 001010000000102</span><br><span>diff --git a/pysim-testdata/sysmoUSIM-SJS1.ok b/pysim-testdata/sysmoUSIM-SJS1.ok</span><br><span>index 3bbdc90..b6a5391 100644</span><br><span>--- a/pysim-testdata/sysmoUSIM-SJS1.ok</span><br><span>+++ b/pysim-testdata/sysmoUSIM-SJS1.ok</span><br><span>@@ -1,4 +1,4 @@</span><br><span style="color: hsl(0, 100%, 40%);">-Using PC/SC reader (dev=0) interface</span><br><span style="color: hsl(120, 100%, 40%);">+Using PC/SC reader (dev=1) interface</span><br><span> Reading ...</span><br><span> ICCID: 1122334455667788990</span><br><span> IMSI: 001010000000102</span><br><span>diff --git a/pysim-testdata/sysmosim-gr1.ok b/pysim-testdata/sysmosim-gr1.ok</span><br><span>index a1a49fd..d4c3dd9 100644</span><br><span>--- a/pysim-testdata/sysmosim-gr1.ok</span><br><span>+++ b/pysim-testdata/sysmosim-gr1.ok</span><br><span>@@ -1,4 +1,4 @@</span><br><span style="color: hsl(0, 100%, 40%);">-Using PC/SC reader (dev=2) interface</span><br><span style="color: hsl(120, 100%, 40%);">+Using PC/SC reader (dev=3) interface</span><br><span> Reading ...</span><br><span> ICCID: 1122334455667788990</span><br><span> IMSI: 001010000000102</span><br><span>diff --git a/tests/pysim-test.sh b/tests/pysim-test.sh</span><br><span>index f97722d..c3e1747 100755</span><br><span>--- a/tests/pysim-test.sh</span><br><span>+++ b/tests/pysim-test.sh</span><br><span>@@ -78,7 +78,11 @@</span><br><span> stat ./$CARD_NAME.ok > /dev/null</span><br><span> python $PYSIM_READ -p $TERMINAL > $TEMPFILE</span><br><span> set +e</span><br><span style="color: hsl(0, 100%, 40%);">- CARD_DIFF=$(diff $TEMPFILE ./$CARD_NAME.ok)</span><br><span style="color: hsl(120, 100%, 40%);">+ # Note: We ignore the first line of output in the diff because here</span><br><span style="color: hsl(120, 100%, 40%);">+ # pysim would print the device number of the reader and we do not</span><br><span style="color: hsl(120, 100%, 40%);">+ # want the test to fail just because the card is put into a different</span><br><span style="color: hsl(120, 100%, 40%);">+ # reader device.</span><br><span style="color: hsl(120, 100%, 40%);">+ CARD_DIFF=$(diff + 1 $TEMPFILE ./$CARD_NAME.ok)</span><br><span> set -e</span><br><span> </span><br><span> if [ "$CARD_DIFF" != "" ]; then</span><br><span>@@ -156,6 +160,7 @@</span><br><span> OPC=FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</span><br><span> IMSI=001010000000001</span><br><span> ADM=00000000</span><br><span style="color: hsl(120, 100%, 40%);">+ ADM_HEX=""</span><br><span> ADM_OPT="-a"</span><br><span> </span><br><span> source "$CARD_NAME.data"</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/16564">change 16564</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/+/16564"/><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: I12e6b46787efb39c5745f4e7f3cdcca9209881b8 </div>
<div style="display:none"> Gerrit-Change-Number: 16564 </div>
<div style="display:none"> Gerrit-PatchSet: 12 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>