dexter has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/37822?usp=email )

(

7 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-trace test and its data into a sub directory ......................................................................

tests: move pySim-trace test and its data into a sub directory

We currently have the test data for pySim-trace in pysim-testdata. This means we mix the test data with the data from our original pySim integration tests. This is very confusing. Let's put the test data and the testcase for pySim-trace into a dedicated sub directory.

Change-Id: I565b4268a05c1a1334b5e7d3fbcd9ef2ef0f0c4c Related: OS#6531 --- M contrib/jenkins.sh R tests/pySim-trace_test/pySim-trace_test.sh R tests/pySim-trace_test/pySim-trace_test_gsmtap.pcapng R tests/pySim-trace_test/pySim-trace_test_gsmtap.pcapng.ok 4 files changed, 6 insertions(+), 3 deletions(-)

Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified

diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 3dabdd7..099c338 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -32,7 +32,10 @@ # Run the test with physical cards cd pysim-testdata ../tests/pySim-prog_test.sh - ../tests/pySim-trace_test.sh + cd .. + + # Run pySim-trace test + tests/pySim-trace_test/pySim-trace_test.sh ;; "distcheck") virtualenv -p python3 venv --system-site-packages diff --git a/tests/pySim-trace_test.sh b/tests/pySim-trace_test/pySim-trace_test.sh similarity index 95% rename from tests/pySim-trace_test.sh rename to tests/pySim-trace_test/pySim-trace_test.sh index 3e200c3..ec23ad3 100755 --- a/tests/pySim-trace_test.sh +++ b/tests/pySim-trace_test/pySim-trace_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_TRACE=../pySim-trace.py -GSMTAP_TRACE=pySim-trace_test_gsmtap.pcapng +PYSIM_TRACE=./pySim-trace.py +GSMTAP_TRACE=./tests/pySim-trace_test/pySim-trace_test_gsmtap.pcapng TEMPFILE=temp.tmp

export PYSIM_INTEGRATION_TEST=1 diff --git a/pysim-testdata/pySim-trace_test_gsmtap.pcapng b/tests/pySim-trace_test/pySim-trace_test_gsmtap.pcapng similarity index 100% rename from pysim-testdata/pySim-trace_test_gsmtap.pcapng rename to tests/pySim-trace_test/pySim-trace_test_gsmtap.pcapng Binary files differ diff --git a/pysim-testdata/pySim-trace_test_gsmtap.pcapng.ok b/tests/pySim-trace_test/pySim-trace_test_gsmtap.pcapng.ok similarity index 100% rename from pysim-testdata/pySim-trace_test_gsmtap.pcapng.ok rename to tests/pySim-trace_test/pySim-trace_test_gsmtap.pcapng.ok