diff options
author | Samuel Mendoza-Jonas <sam@mendozajonas.com> | 2019-01-17 13:32:24 +1100 |
---|---|---|
committer | Samuel Mendoza-Jonas <sam@mendozajonas.com> | 2019-02-01 11:07:50 +1100 |
commit | 28d0d7035ee3099935ef264db40a86142c098ec5 (patch) | |
tree | 7bdc08eb8c6e3e1ccbf41c1f1616a9f6bdd33dcd /test/parser | |
parent | 89cde533356d47b34a80679602c3900572b2dca6 (diff) | |
download | talos-petitboot-28d0d7035ee3099935ef264db40a86142c098ec5.tar.gz talos-petitboot-28d0d7035ee3099935ef264db40a86142c098ec5.zip |
lib/url: Include port in pb_url_to_string()v1.10.1
And include a pxe-parser test which uses a port in the path prefix to
exercise this. This could cause PXE discovery failures if parameters
such as pathprefix included a port in the URL.
Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
Diffstat (limited to 'test/parser')
-rw-r--r-- | test/parser/Makefile.am | 1 | ||||
-rw-r--r-- | test/parser/test-pxe-pathprefix-port.c | 40 |
2 files changed, 41 insertions, 0 deletions
diff --git a/test/parser/Makefile.am b/test/parser/Makefile.am index 483add9..f9083bd 100644 --- a/test/parser/Makefile.am +++ b/test/parser/Makefile.am @@ -75,6 +75,7 @@ parser_TESTS = \ test/parser/test-pxe-non-url-pathprefix-with-conf \ test/parser/test-pxe-pathprefix-discover \ test/parser/test-pxe-pathprefix-discover-mac \ + test/parser/test-pxe-pathprefix-port \ test/parser/test-pxe-path-resolve-relative \ test/parser/test-pxe-path-resolve-absolute \ test/parser/test-pxe-discover-bootfile-root \ diff --git a/test/parser/test-pxe-pathprefix-port.c b/test/parser/test-pxe-pathprefix-port.c new file mode 100644 index 0000000..c7d018e --- /dev/null +++ b/test/parser/test-pxe-pathprefix-port.c @@ -0,0 +1,40 @@ + +#include "parser-test.h" + +#if 0 /* PARSER_EMBEDDED_CONFIG */ +default linux + +label linux +kernel ./kernel +append command line +initrd /initrd +#endif + +void run_test(struct parser_test *test) +{ + struct discover_boot_option *opt; + struct discover_context *ctx; + + test_read_conf_embedded_url(test, + "http://host:8080/path/to/pxelinux.cfg/default"); + + test_set_event_source(test); + test_set_event_param(test->ctx->event, "ip", "192.168.0.1"); + test_set_event_param(test->ctx->event, "pxepathprefix", + "http://host:8080/path/to/"); + + test_run_parser(test, "pxe"); + + ctx = test->ctx; + + check_boot_option_count(ctx, 1); + opt = get_boot_option(ctx, 0); + + check_name(opt, "linux"); + check_args(opt, "command line"); + + check_resolved_url_resource(opt->boot_image, + "http://host:8080/path/to/./kernel"); + check_resolved_url_resource(opt->initrd, + "http://host:8080/path/to/initrd"); +} |