diff options
| author | Oliver Smith <osmith@sysmocom.de> | 2023-02-23 10:05:16 +0100 |
|---|---|---|
| committer | Oliver Smith <osmith@sysmocom.de> | 2023-02-23 12:17:39 +0100 |
| commit | b7d8509ecff01e7a1f930cf45fb821d64d6e52ef (patch) | |
| tree | f7a58f219efe21728c4f63e9bb0ce52d36cb0523 | |
| parent | e91128886c47c5c4182e3a4ab01a6ffe7df8ba44 (diff) | |
tests: adjust to XOR-3G rename in libosmocore
Fix forward compatibility to current master of libosmocore / future
versions where the value_string for OSMO_AUTH_ALG_XOR has been changed.
Adjust the tests so they pass with both the old and the new version.
Related: libosmocore I446e54d0ddf4a18c46ee022b1249af73552e3ce1
Change-Id: I391b1a9b52e1969172aba9d4a1cc5792fc077fe1
(cherry picked from commit 42f82975f23b381a2fcfb42aacbd72660a0ee7f4)
| -rw-r--r-- | tests/test_subscriber.ctrl | 3 | ||||
| -rw-r--r-- | tests/test_subscriber.vty | 2 | ||||
| -rw-r--r-- | tests/testsuite.at | 7 |
3 files changed, 7 insertions, 5 deletions
diff --git a/tests/test_subscriber.ctrl b/tests/test_subscriber.ctrl index ff26d4c..e827662 100644 --- a/tests/test_subscriber.ctrl +++ b/tests/test_subscriber.ctrl @@ -677,9 +677,6 @@ GET_REPLY 112 subscriber.by-imsi-901991234567891.aud2g none SET 113 subscriber.by-imsi-901991234567891.aud2g xor,c01ffedc1cadaeac1d1f1edacac1ab0a SET_REPLY 113 subscriber.by-imsi-901991234567891.aud2g OK -GET 114 subscriber.by-imsi-901991234567891.aud2g -GET_REPLY 114 subscriber.by-imsi-901991234567891.aud2g XOR,c01ffedc1cadaeac1d1f1edacac1ab0a - SET 115 subscriber.by-imsi-901991234567891.aud2g none SET_REPLY 115 subscriber.by-imsi-901991234567891.aud2g OK diff --git a/tests/test_subscriber.vty b/tests/test_subscriber.vty index fe7499c..cfbcd8b 100644 --- a/tests/test_subscriber.vty +++ b/tests/test_subscriber.vty @@ -160,7 +160,7 @@ OsmoHLR# subscriber imsi 123456789023000 show ID: 101 IMSI: 123456789023000 MSISDN: 423 - 2G auth: XOR +... KI=deaf0ff1ced0d0dabbedd1ced1cef00d OsmoHLR# subscriber imsi 123456789023000 update aud2g comp128v1 ki BeefedCafeFaceAcedAddedDecadeFee diff --git a/tests/testsuite.at b/tests/testsuite.at index 65f90b4..dde7d8b 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -27,7 +27,12 @@ AT_KEYWORDS([db]) cat $abs_srcdir/db/db_test.ok > expout cat $abs_srcdir/db/db_test.err > experr sqlite3 db_test.db < $abs_top_srcdir/sql/hlr.sql -AT_CHECK([$abs_top_builddir/tests/db/db_test], [], [expout], [experr]) + +# Compatibility with libosmocore I446e54d0ddf4a18c46ee022b1249af73552e3ce1 +$abs_top_builddir/tests/db/db_test >out 2>err +sed -i "s/XOR-3G,/XOR,/g" err + +AT_CHECK([cat out; cat err >&2], [], [expout], [experr]) AT_CLEANUP # AT_SKIP_IF: disable for old sqlite versions, because the way we dump tables in the test doesn't work with it. |