From 4e724391e042cf8a45bf32b2d069120b749bda40 Mon Sep 17 00:00:00 2001
From: Philipp Maier <pmaier@sysmocom.de>
Date: Thu, 12 Dec 2019 17:02:22 +0100
Subject: [PATCH] Fix automated tests

- The .ok files currently dictate in which pysical reader device the
card must be placed. Lets remove this dependncy to make the setup more
reliable. Testing in which reade a card is placed is not in the scope of
our tests.

- Fix bug in pysim-test.sh (test runner), so that the veriable $ADM_HEX
gets reset after the execution of the tests.

Change-Id: I12e6b46787efb39c5745f4e7f3cdcca9209881b8
---
 pysim-testdata/Fairwaves-SIM.ok  | 2 +-
 pysim-testdata/Wavemobile-SIM.ok | 2 +-
 pysim-testdata/fakemagicsim.ok   | 2 +-
 pysim-testdata/sysmoUSIM-SJS1.ok | 2 +-
 pysim-testdata/sysmosim-gr1.ok   | 2 +-
 tests/pysim-test.sh              | 7 ++++++-
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/pysim-testdata/Fairwaves-SIM.ok b/pysim-testdata/Fairwaves-SIM.ok
index 7f607657..61504691 100644
--- a/pysim-testdata/Fairwaves-SIM.ok
+++ b/pysim-testdata/Fairwaves-SIM.ok
@@ -1,4 +1,4 @@
-Using PC/SC reader (dev=4) interface
+Using PC/SC reader (dev=0) interface
 Reading ...
 ICCID: 8988219000000117833
 IMSI: 001010000000111
diff --git a/pysim-testdata/Wavemobile-SIM.ok b/pysim-testdata/Wavemobile-SIM.ok
index 5f5b3606..b0ea8be9 100644
--- a/pysim-testdata/Wavemobile-SIM.ok
+++ b/pysim-testdata/Wavemobile-SIM.ok
@@ -1,4 +1,4 @@
-Using PC/SC reader (dev=3) interface
+Using PC/SC reader (dev=4) interface
 Reading ...
 ICCID: 89445310150011013678
 IMSI: 001010000000102
diff --git a/pysim-testdata/fakemagicsim.ok b/pysim-testdata/fakemagicsim.ok
index a1d9e9c8..d9bff94b 100644
--- a/pysim-testdata/fakemagicsim.ok
+++ b/pysim-testdata/fakemagicsim.ok
@@ -1,4 +1,4 @@
-Using PC/SC reader (dev=1) interface
+Using PC/SC reader (dev=2) interface
 Reading ...
 ICCID: 1122334455667788990
 IMSI: 001010000000102
diff --git a/pysim-testdata/sysmoUSIM-SJS1.ok b/pysim-testdata/sysmoUSIM-SJS1.ok
index 3bbdc901..b6a53911 100644
--- a/pysim-testdata/sysmoUSIM-SJS1.ok
+++ b/pysim-testdata/sysmoUSIM-SJS1.ok
@@ -1,4 +1,4 @@
-Using PC/SC reader (dev=0) interface
+Using PC/SC reader (dev=1) interface
 Reading ...
 ICCID: 1122334455667788990
 IMSI: 001010000000102
diff --git a/pysim-testdata/sysmosim-gr1.ok b/pysim-testdata/sysmosim-gr1.ok
index a1a49fdb..d4c3dd94 100644
--- a/pysim-testdata/sysmosim-gr1.ok
+++ b/pysim-testdata/sysmosim-gr1.ok
@@ -1,4 +1,4 @@
-Using PC/SC reader (dev=2) interface
+Using PC/SC reader (dev=3) interface
 Reading ...
 ICCID: 1122334455667788990
 IMSI: 001010000000102
diff --git a/tests/pysim-test.sh b/tests/pysim-test.sh
index f97722d6..c3e1747a 100755
--- a/tests/pysim-test.sh
+++ b/tests/pysim-test.sh
@@ -78,7 +78,11 @@ function check_card {
     stat ./$CARD_NAME.ok > /dev/null
     python $PYSIM_READ -p $TERMINAL > $TEMPFILE
     set +e
-    CARD_DIFF=$(diff $TEMPFILE ./$CARD_NAME.ok)
+    # Note: We ignore the first line of output in the diff because here
+    # pysim would print the device number of the reader and we do not
+    # want the test to fail just because the card is put into a different
+    # reader device.
+    CARD_DIFF=$(diff + 1 $TEMPFILE ./$CARD_NAME.ok)
     set -e
 
     if [ "$CARD_DIFF" != "" ]; then
@@ -156,6 +160,7 @@ function run_test {
 	OPC=FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 	IMSI=001010000000001
 	ADM=00000000
+	ADM_HEX=""
 	ADM_OPT="-a"
 
 	source "$CARD_NAME.data"