Migrates to new latest broadcast endpoint.

This commit is contained in:
Marco Vermeulen
2014-08-06 22:30:07 +01:00
parent b3edf612e2
commit 302ac73f89
3 changed files with 5 additions and 7 deletions

View File

@@ -54,7 +54,7 @@ function gvm {
if [[ "$GVM_FORCE_OFFLINE" == "true" || ( "$COMMAND" == "offline" && "$QUALIFIER" == "enable" ) ]]; then
BROADCAST_LIVE=""
else
BROADCAST_LIVE=$(curl -s "${GVM_BROADCAST_SERVICE}/broadcast/${GVM_VERSION}")
BROADCAST_LIVE=$(curl -s "${GVM_BROADCAST_SERVICE}/broadcast/latest")
gvm_check_offline "$BROADCAST_LIVE"
if [[ "$GVM_FORCE_OFFLINE" == 'true' ]]; then BROADCAST_LIVE=""; fi
fi

View File

@@ -8,7 +8,7 @@ And(~'^no prior Broadcast was received$') { ->
}
And(~'^a new Broadcast "([^"]*)" is available$') { String broadcast ->
primeEndpoint("/broadcast/$gvmVersion", broadcast)
primeEndpoint("/broadcast/latest", broadcast)
}
And(~'^a prior Broadcast "([^"]*)" was issued$') { String broadcast ->

View File

@@ -35,8 +35,6 @@ And(~'^an initialised shell$') { ->
}
And(~'^an outdated system$') { ->
primeEndpoint("/broadcast/$gvmVersionOutdated", "This is a LIVE Broadcast!")
def initScript = "$gvmDir/bin/gvm-init.sh" as File
initScript.text = initScript.text.replace(gvmVersion, gvmVersionOutdated)
}
@@ -47,7 +45,7 @@ And(~'^I reinitialise the shell$') { ->
}
And(~'^the internet is reachable$') {->
primeEndpoint("/broadcast/$gvmVersion", "This is a LIVE Broadcast!")
primeEndpoint("/broadcast/latest", "This is a LIVE Broadcast!")
forcedOffline = false
online = true
@@ -63,7 +61,7 @@ And(~'^the internet is not reachable$') {->
}
And(~'^offline mode is disabled with reachable internet$') {->
primeEndpoint("/broadcast/$gvmVersion", "This is a LIVE Broadcast!")
primeEndpoint("/broadcast/latest", "This is a LIVE Broadcast!")
forcedOffline = false
online = true
@@ -72,7 +70,7 @@ And(~'^offline mode is disabled with reachable internet$') {->
}
And(~'^offline mode is enabled with reachable internet$') {->
primeEndpoint("/broadcast/$gvmVersion", "This is a LIVE Broadcast!")
primeEndpoint("/broadcast/latest", "This is a LIVE Broadcast!")
forcedOffline = true
online = true