From 88b80c412d30d7a01bcc54498c8f700208383907 Mon Sep 17 00:00:00 2001 From: Jon Lockwood Date: Sat, 29 Jan 2022 14:04:05 +0930 Subject: [PATCH] test: build URLs dont require the build path in the name MR !5 --- test/unit/conftest.py | 2 ++ test/unit/main_test.py | 9 ++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/test/unit/conftest.py b/test/unit/conftest.py index 070b050..d4f42e2 100644 --- a/test/unit/conftest.py +++ b/test/unit/conftest.py @@ -34,6 +34,8 @@ class Data: request_path = url.replace(request_protocol + '://','')[1:] + request_path = request_path.replace(self.suffux_path[1:], '') + return { 'url_id': url_id, 'url': url, diff --git a/test/unit/main_test.py b/test/unit/main_test.py index 22fb832..dbf6348 100644 --- a/test/unit/main_test.py +++ b/test/unit/main_test.py @@ -64,6 +64,12 @@ class Test: request_path = str(data['request_path']) + if request_path[0:1] == '/': + if request_path[0:1] == request_path: + request_path = 'index.html' + else: + request_path = request_path[1:] + if '#' in request_path: request_path_split = request_path.split('#') request_path = str(request_path_split[0]) @@ -82,9 +88,6 @@ class Test: request_path = request_path - request_path = request_path.replace('/' + path_suffix[1:] + '/','') - request_path = request_path.replace(path_suffix[1:] + '/','') - print('DEBUG consructed path:' + request_path) assert request_path in self.source_files, (