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 42f82975f2)
This commit is contained in:
Oliver Smith
2023-02-23 10:05:16 +01:00
parent e91128886c
commit b7d8509ecf
3 changed files with 7 additions and 5 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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.