deploy support for RCs, fix enable test
Signed-off-by: Adam Hill <adam@diginc.us>
This commit is contained in:
parent
d3309ebb1a
commit
8ece19132d
|
@ -45,7 +45,7 @@ if [[ "$version" == 'unset' ]]; then
|
||||||
echo "Version number var is unset and master branch needs a version...pass in \$version variable!"
|
echo "Version number var is unset and master branch needs a version...pass in \$version variable!"
|
||||||
exit 1
|
exit 1
|
||||||
elif [[ "$branch" = "release/"* ]]; then
|
elif [[ "$branch" = "release/"* ]]; then
|
||||||
version="$(echo $branch | grep -Po 'v[\d\.-]*')"
|
version="$(echo $branch | grep -Po 'v[\d\w\.-]*')"
|
||||||
echo "Version number is being taken from this release branch $version"
|
echo "Version number is being taken from this release branch $version"
|
||||||
else
|
else
|
||||||
version="$branch"
|
version="$branch"
|
||||||
|
|
|
@ -32,7 +32,7 @@ def RunningPiHole(DockerPersist, Slow, persist_webserver, persist_tag, start_cmd
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize('start_cmd,hostname,expected_ip, expected_messages', [
|
@pytest.mark.parametrize('start_cmd,hostname,expected_ip, expected_messages', [
|
||||||
('enable', 'pi.hole', '127.0.0.1', ['Enabling blocking','Pi-hole Enabled']),
|
('enable', 'pi.hole', '127.0.0.1', ['Blocking already enabled,','nothing to do']),
|
||||||
('disable', 'pi.hole', '127.0.0.1', ['Disabling blocking','Pi-hole Disabled']),
|
('disable', 'pi.hole', '127.0.0.1', ['Disabling blocking','Pi-hole Disabled']),
|
||||||
])
|
])
|
||||||
def test_pihole_enable_disable_command(RunningPiHole, Dig, persist_tag, start_cmd, hostname, expected_ip, expected_messages):
|
def test_pihole_enable_disable_command(RunningPiHole, Dig, persist_tag, start_cmd, hostname, expected_ip, expected_messages):
|
||||||
|
|
Loading…
Reference in New Issue