dexter has uploaded this change for review. (
https://gerrit.osmocom.org/c/pysim/+/37823?usp=email )
Change subject: tests: move pySim-prog test and its data into a sub directory
......................................................................
tests: move pySim-prog test and its data into a sub directory
We currently have the shell script that performs the test in the
tests directory and the related data in pysim-testdata directory.
This is confusing, let's have evrything in a dedicated sub directory
Change-Id: Ic995a7f600d164fc0be3c2eb8255dbe043429bea
Related: OS#6531
---
M contrib/jenkins.sh
R tests/pySim-prog_test/Fairwaves-SIM.data
R tests/pySim-prog_test/Fairwaves-SIM.ok
R tests/pySim-prog_test/Wavemobile-SIM.data
R tests/pySim-prog_test/Wavemobile-SIM.ok
R tests/pySim-prog_test/fakemagicsim.data
R tests/pySim-prog_test/fakemagicsim.ok
R tests/pySim-prog_test/pySim-prog_test.sh
R tests/pySim-prog_test/sysmoISIM-SJA2.data
R tests/pySim-prog_test/sysmoISIM-SJA2.ok
R tests/pySim-prog_test/sysmoUSIM-SJS1.data
R tests/pySim-prog_test/sysmoUSIM-SJS1.ok
R tests/pySim-prog_test/sysmosim-gr1.data
R tests/pySim-prog_test/sysmosim-gr1.ok
14 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/23/37823/1
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index f0b4d23..abbf352 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -28,9 +28,7 @@
python -m unittest discover -v -s tests/unittests
# Run the test with physical cards
- cd pysim-testdata
- ../tests/pySim-prog_test.sh
- cd ..
+ tests/pySim-prog_test/pySim-prog_test.sh
# Run pySim-trace test
tests/pySim-trace_test/pySim-trace_test.sh
diff --git a/pysim-testdata/Fairwaves-SIM.data
b/tests/pySim-prog_test/Fairwaves-SIM.data
similarity index 100%
rename from pysim-testdata/Fairwaves-SIM.data
rename to tests/pySim-prog_test/Fairwaves-SIM.data
diff --git a/pysim-testdata/Fairwaves-SIM.ok
b/tests/pySim-prog_test/Fairwaves-SIM.ok
similarity index 100%
rename from pysim-testdata/Fairwaves-SIM.ok
rename to tests/pySim-prog_test/Fairwaves-SIM.ok
diff --git a/pysim-testdata/Wavemobile-SIM.data
b/tests/pySim-prog_test/Wavemobile-SIM.data
similarity index 100%
rename from pysim-testdata/Wavemobile-SIM.data
rename to tests/pySim-prog_test/Wavemobile-SIM.data
diff --git a/pysim-testdata/Wavemobile-SIM.ok
b/tests/pySim-prog_test/Wavemobile-SIM.ok
similarity index 100%
rename from pysim-testdata/Wavemobile-SIM.ok
rename to tests/pySim-prog_test/Wavemobile-SIM.ok
diff --git a/pysim-testdata/fakemagicsim.data
b/tests/pySim-prog_test/fakemagicsim.data
similarity index 100%
rename from pysim-testdata/fakemagicsim.data
rename to tests/pySim-prog_test/fakemagicsim.data
diff --git a/pysim-testdata/fakemagicsim.ok
b/tests/pySim-prog_test/fakemagicsim.ok
similarity index 100%
rename from pysim-testdata/fakemagicsim.ok
rename to tests/pySim-prog_test/fakemagicsim.ok
diff --git a/tests/pySim-prog_test.sh b/tests/pySim-prog_test/pySim-prog_test.sh
similarity index 97%
rename from tests/pySim-prog_test.sh
rename to tests/pySim-prog_test/pySim-prog_test.sh
index 28d9777..0de80a3 100755
--- a/tests/pySim-prog_test.sh
+++ b/tests/pySim-prog_test/pySim-prog_test.sh
@@ -20,13 +20,15 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-PYSIM_PROG=../pySim-prog.py
-PYSIM_READ=../pySim-read.py
+# All pathes relative to the location of this script
+PYSIM_PROG=../../pySim-prog.py
+PYSIM_READ=../../pySim-read.py
TEMPFILE=temp.tmp
PYTHON=python3
export PYSIM_INTEGRATION_TEST=1
set -e
+cd "$(dirname "$0")"
echo "pySim-prog_test - a test program to test pySim-prog.py"
echo "======================================================"
diff --git a/pysim-testdata/sysmoISIM-SJA2.data
b/tests/pySim-prog_test/sysmoISIM-SJA2.data
similarity index 100%
rename from pysim-testdata/sysmoISIM-SJA2.data
rename to tests/pySim-prog_test/sysmoISIM-SJA2.data
diff --git a/pysim-testdata/sysmoISIM-SJA2.ok
b/tests/pySim-prog_test/sysmoISIM-SJA2.ok
similarity index 100%
rename from pysim-testdata/sysmoISIM-SJA2.ok
rename to tests/pySim-prog_test/sysmoISIM-SJA2.ok
diff --git a/pysim-testdata/sysmoUSIM-SJS1.data
b/tests/pySim-prog_test/sysmoUSIM-SJS1.data
similarity index 100%
rename from pysim-testdata/sysmoUSIM-SJS1.data
rename to tests/pySim-prog_test/sysmoUSIM-SJS1.data
diff --git a/pysim-testdata/sysmoUSIM-SJS1.ok
b/tests/pySim-prog_test/sysmoUSIM-SJS1.ok
similarity index 100%
rename from pysim-testdata/sysmoUSIM-SJS1.ok
rename to tests/pySim-prog_test/sysmoUSIM-SJS1.ok
diff --git a/pysim-testdata/sysmosim-gr1.data
b/tests/pySim-prog_test/sysmosim-gr1.data
similarity index 100%
rename from pysim-testdata/sysmosim-gr1.data
rename to tests/pySim-prog_test/sysmosim-gr1.data
diff --git a/pysim-testdata/sysmosim-gr1.ok
b/tests/pySim-prog_test/sysmosim-gr1.ok
similarity index 100%
rename from pysim-testdata/sysmosim-gr1.ok
rename to tests/pySim-prog_test/sysmosim-gr1.ok
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/37823?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Ic995a7f600d164fc0be3c2eb8255dbe043429bea
Gerrit-Change-Number: 37823
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <[email protected]>
