dexter has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/37823?usp=email ) ( 13 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )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, 7 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 099c338..b3d83dd 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -9,7 +9,7 @@ export PYTHONUNBUFFERED=1 -if [ ! -d "./pysim-testdata/" ] ; then +if [ ! -d "./tests/" ] ; then echo "###############################################" echo "Please call from pySim-prog top directory" echo "###############################################" @@ -29,10 +29,10 @@ # Execute automatically discovered unit tests first python -m unittest discover -v -s tests/unittests - # Run the test with physical cards - cd pysim-testdata - ../tests/pySim-prog_test.sh - cd .. + # Run pySim-prog integration tests (requires physical cards) + cd tests/pySim-prog_test/ + ./pySim-prog_test.sh + cd ../../ # 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 98% rename from tests/pySim-prog_test.sh rename to tests/pySim-prog_test/pySim-prog_test.sh index 28d9777..173822a 100755 --- a/tests/pySim-prog_test.sh +++ b/tests/pySim-prog_test/pySim-prog_test.sh @@ -20,8 +20,8 @@ # 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 +PYSIM_PROG=../../pySim-prog.py +PYSIM_READ=../../pySim-read.py TEMPFILE=temp.tmp PYTHON=python3 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: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic995a7f600d164fc0be3c2eb8255dbe043429bea Gerrit-Change-Number: 37823 Gerrit-PatchSet: 15 Gerrit-Owner: dexter <pmaier@sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier@sysmocom.de> Gerrit-Reviewer: laforge <laforge@osmocom.org>