[S] Change in osmo-hlr[osmith/1.5.1]: tests: adjust to XOR-3G rename in libosmocore

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/31472 ) Change subject: tests: adjust to XOR-3G rename in libosmocore ...................................................................... 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) --- M tests/test_subscriber.ctrl M tests/test_subscriber.vty M tests/testsuite.at 3 files changed, 22 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve 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 @@ 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 @@ 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 @@ 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. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/31472 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: osmith/1.5.1 Gerrit-Change-Id: I391b1a9b52e1969172aba9d4a1cc5792fc077fe1 Gerrit-Change-Number: 31472 Gerrit-PatchSet: 1 Gerrit-Owner: osmith &lt;osmith(a)sysmocom.de&gt; Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria &lt;vyanitskiy(a)sysmocom.de&gt; Gerrit-Reviewer: laforge &lt;laforge(a)osmocom.org&gt; Gerrit-Reviewer: osmith &lt;osmith(a)sysmocom.de&gt; Gerrit-MessageType: merged