diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2017-10-15 03:24:43 +0200 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2017-10-17 01:07:32 +0200 |
| commit | 50e4de7e499681e5e8a844951a1979e34546101c (patch) | |
| tree | 4296c790c6efa6e1084b3a1f769753cbb4cd83ab /tests/Makefile.am | |
| parent | 86d09ec2663872664a348f987b87e4302c2aa22b (diff) | |
replace ctrl_test_runner.py with transcript test_subscriber.ctrl
Use the new osmo_verify_transcript_ctrl.py from osmo-python-tests to completely
replace current ctrl_test_runner.py with a CTRL interaction transcript.
Add missing EXTRA_DIST entry of test_subscriber.sql.
Depends: osmo-python-tests Id47331009910e651372b9c9c76e12f2e8964cc2c
Change-Id: Iff93abe370b8f3ecf42082d1d0eaa1fbeca5b122
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index cddea0b..e71a250 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -28,7 +28,8 @@ EXTRA_DIST = \ $(TESTSUITE) \ test_nodes.vty \ test_subscriber.vty \ - ctrl_test_runner.py \ + test_subscriber.sql \ + test_subscriber.ctrl \ $(NULL) TESTSUITE = $(srcdir)/testsuite @@ -41,7 +42,7 @@ if ENABLE_EXT_TESTS python-tests: # don't run vty and ctrl tests concurrently so that the ports don't conflict $(MAKE) vty-test - $(PYTHON) $(srcdir)/ctrl_test_runner.py -w $(abs_top_builddir) -v + $(MAKE) ctrl-test VTY_TEST_DB = hlr_vty_test.db @@ -56,6 +57,22 @@ vty-test: -r "$(top_builddir)/src/osmo-hlr -c $(top_srcdir)/doc/examples/osmo-hlr.cfg -l hlr_vty_test.db" \ $(U) $(srcdir)/*.vty -rm -f $(VTY_TEST_DB) + +CTRL_TEST_DB = hlr_ctrl_test.db + +# To update the CTRL script from current application behavior, +# pass -u to ctrl_script_runner.py by doing: +# make ctrl-test U=-u +ctrl-test: + -rm -f $(CTRL_TEST_DB) + sqlite3 $(CTRL_TEST_DB) < $(top_srcdir)/sql/hlr.sql + sqlite3 $(CTRL_TEST_DB) < $(srcdir)/test_subscriber.sql + osmo_verify_transcript_ctrl.py -v \ + -p 4259 \ + -r "$(top_builddir)/src/osmo-hlr -c $(top_srcdir)/doc/examples/osmo-hlr.cfg -l hlr_ctrl_test.db" \ + $(U) $(srcdir)/*.ctrl + -rm -f $(CTRL_TEST_DB) + else python-tests: echo "Not running python-based tests (determined at configure-time)" |