From 473117e8a8c1366061b144df661e6c8c8bd68ca8 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Mon, 29 Aug 2022 11:50:19 +0100 Subject: [PATCH] Rename start and gravity scripts to match their service names Signed-off-by: Adam Warner --- .../debian-root/etc/s6-overlay/s6-rc.d/_gravityonboot/up | 2 +- src/s6/debian-root/etc/s6-overlay/s6-rc.d/_startup/up | 2 +- .../usr/local/bin/{gravityonboot.sh => _gravityonboot.sh} | 0 .../debian-root/usr/local/bin/{start.sh => _startup.sh} | 0 test/tests/conftest.py | 2 +- test/tests/test_bash_functions.py | 8 ++++---- test/tests/test_start.py | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) rename src/s6/debian-root/usr/local/bin/{gravityonboot.sh => _gravityonboot.sh} (100%) rename src/s6/debian-root/usr/local/bin/{start.sh => _startup.sh} (100%) diff --git a/src/s6/debian-root/etc/s6-overlay/s6-rc.d/_gravityonboot/up b/src/s6/debian-root/etc/s6-overlay/s6-rc.d/_gravityonboot/up index af0c454..d61fc03 100755 --- a/src/s6/debian-root/etc/s6-overlay/s6-rc.d/_gravityonboot/up +++ b/src/s6/debian-root/etc/s6-overlay/s6-rc.d/_gravityonboot/up @@ -1,2 +1,2 @@ #!/command/execlineb -background { bash -e /usr/local/bin/gravityonboot.sh } \ No newline at end of file +background { bash -e /usr/local/bin/_gravityonboot.sh } \ No newline at end of file diff --git a/src/s6/debian-root/etc/s6-overlay/s6-rc.d/_startup/up b/src/s6/debian-root/etc/s6-overlay/s6-rc.d/_startup/up index cf8427d..e547857 100755 --- a/src/s6/debian-root/etc/s6-overlay/s6-rc.d/_startup/up +++ b/src/s6/debian-root/etc/s6-overlay/s6-rc.d/_startup/up @@ -1,2 +1,2 @@ #!/command/execlineb -foreground { bash -e /usr/local/bin/start.sh } \ No newline at end of file +foreground { bash -e /usr/local/bin/_startup.sh } \ No newline at end of file diff --git a/src/s6/debian-root/usr/local/bin/gravityonboot.sh b/src/s6/debian-root/usr/local/bin/_gravityonboot.sh similarity index 100% rename from src/s6/debian-root/usr/local/bin/gravityonboot.sh rename to src/s6/debian-root/usr/local/bin/_gravityonboot.sh diff --git a/src/s6/debian-root/usr/local/bin/start.sh b/src/s6/debian-root/usr/local/bin/_startup.sh similarity index 100% rename from src/s6/debian-root/usr/local/bin/start.sh rename to src/s6/debian-root/usr/local/bin/_startup.sh diff --git a/test/tests/conftest.py b/test/tests/conftest.py index 014d0a8..72cb53f 100644 --- a/test/tests/conftest.py +++ b/test/tests/conftest.py @@ -185,7 +185,7 @@ def dig(): return _dig ''' -Persistent Docker container for testing service post start.sh +Persistent Docker container for testing service post _startup.sh ''' @pytest.fixture def running_pihole(docker_persist, slow, persist_webserver): diff --git a/test/tests/test_bash_functions.py b/test/tests/test_bash_functions.py index 41f8106..67c6a5e 100644 --- a/test/tests/test_bash_functions.py +++ b/test/tests/test_bash_functions.py @@ -43,7 +43,7 @@ def test_overrides_default_web_port(docker, slow, test_args): CONFIG_LINE = r'server.port\s*=\s*999' WEB_CONFIG = '/etc/lighttpd/lighttpd.conf' - function = docker.run('. /bash_functions.sh ; eval `grep setup_web_port /usr/local/bin/start.sh`') + function = docker.run('. /bash_functions.sh ; eval `grep setup_web_port /usr/local/bin/_startup.sh`') assert "Custom WEB_PORT set to 999" in function.stdout assert "INFO: Without proper router DNAT forwarding to 127.0.0.1:999, you may not get any blocked websites on ads" in function.stdout slow(lambda: re.search(CONFIG_LINE, docker.run(_cat(WEB_CONFIG)).stdout) != None) @@ -55,7 +55,7 @@ def test_overrides_default_web_port(docker, slow, test_args): ('-e WEB_PORT="99999"', 'WARNING: Custom WEB_PORT not used - 99999 is not within valid port range of 1-65535'), ]) def test_bad_input_to_web_port(docker, test_args, expected_error): - function = docker.run('. /bash_functions.sh ; eval `grep setup_web_port /usr/local/bin/start.sh`') + function = docker.run('. /bash_functions.sh ; eval `grep setup_web_port /usr/local/bin/_startup.sh`') assert expected_error in function.stdout @@ -64,7 +64,7 @@ def test_overrides_default_custom_cache_size(docker, slow, test_args, cache_size ''' Changes the cache_size setting to increase or decrease the cache size for dnsmasq''' CONFIG_LINE = r'cache-size\s*=\s*{}'.format(cache_size) - function = docker.run('echo ${CUSTOM_CACHE_SIZE};. ./bash_functions.sh; echo ${CUSTOM_CACHE_SIZE}; eval `grep setup_FTL_CacheSize /usr/local/bin/start.sh`') + function = docker.run('echo ${CUSTOM_CACHE_SIZE};. ./bash_functions.sh; echo ${CUSTOM_CACHE_SIZE}; eval `grep setup_FTL_CacheSize /usr/local/bin/_startup.sh`') assert "Custom CUSTOM_CACHE_SIZE set to {}".format(cache_size) in function.stdout slow(lambda: re.search(CONFIG_LINE, docker.run(_cat(DNSMASQ_CONFIG_LOC)).stdout) != None) @@ -113,7 +113,7 @@ expected_debian_lines = [ def test_debian_setup_php_env(docker, expected_lines, repeat_function): ''' confirm all expected output is there and nothing else ''' for _ in range(repeat_function): - docker.run('. /bash_functions.sh ; eval `grep setup_php_env /usr/local/bin/start.sh`').stdout + docker.run('. /bash_functions.sh ; eval `grep setup_php_env /usr/local/bin/_startup.sh`').stdout for expected_line in expected_lines: search_config_cmd = "grep -c '{}' /etc/lighttpd/conf-enabled/15-fastcgi-php.conf".format(expected_line) search_config_count = docker.run(search_config_cmd) diff --git a/test/tests/test_start.py b/test/tests/test_start.py index da079e2..4be85be 100644 --- a/test/tests/test_start.py +++ b/test/tests/test_start.py @@ -5,7 +5,7 @@ import time docker containers (esp. musl based OSs) stripped down nature ''' -# If the test runs /usr/local/bin/start.sh, do not let s6 run it too! Kill entrypoint to avoid race condition/duplicated execution +# If the test runs /usr/local/bin/_startup.sh, do not let s6 run it too! Kill entrypoint to avoid race condition/duplicated execution @pytest.mark.parametrize('entrypoint,cmd', [('--entrypoint=tail','-f /dev/null')]) @pytest.mark.parametrize('args,error_msg,expect_rc', [ ('-e FTLCONF_LOCAL_IPV4="1.2.3.z"', "FTLCONF_LOCAL_IPV4 Environment variable (1.2.3.z) doesn't appear to be a valid IPv4 address",1), @@ -13,7 +13,7 @@ import time ('-e FTLCONF_LOCAL_IPV4="1.2.3.4" -e FTLCONF_LOCAL_IPV6="kernel"', "ERROR: You passed in IPv6 with a value of 'kernel'",1), ]) def test_ftlconf_local_addr_invalid_ips_triggers_exit_error(docker, error_msg, expect_rc): - start = docker.run('/usr/local/bin/start.sh') + start = docker.run('/usr/local/bin/_startup.sh') assert start.rc == expect_rc assert 'ERROR' in start.stdout assert error_msg in start.stdout