Skip to content

Commit 3360054

Browse files
author
Hao Chen
committed
Fixed webapp slot test naming conflicts.
1 parent c7e16b5 commit 3360054

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

examples/webapp-management/02-WebAppSlot.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ printf "\nSetup: Creating a new resource group: %s at location: %s.\n" "$groupNa
1313
# appName1=`randomName testweb`
1414
# appName2=`randomName testweb`
1515
# appName3=`randomName testweb`
16+
# appName4=`randomName testweb`
1617
# planName1=`randomName testplan`
1718
# planName2=`randomName testplan`
1819
# planName3=`randomName testplan`
@@ -143,30 +144,29 @@ printf "\n18. Create a new web app for clone testing"
143144
location1="eastus"
144145

145146
az app service plan set -n "$planName1" -g "$groupName" --tier "$tier2"
146-
webappInfo2=`az webapp create -g "$groupName" -n "$appName2" -l "$location" --plan "$planName2"`
147+
webappInfo2=`az webapp create -g "$groupName" -n "$appName3" -l "$location" --plan "$planName1"`
147148

148149
printf "\n19. Clone web app slot to a slot."
149-
slotClone=`az webapp slot create -g "$groupName" -n "$appName2" --slot "$slotname3" --sourcewebapp "$webappInfo2"`
150-
appWithSlotNameClone="$appName2/$slotname3"
150+
slotClone=`az webapp slot create -g "$groupName" -n "$appName3" --slot "$slotname3" --sourcewebapp "$webappInfo2"`
151+
appWithSlotNameClone="$appName3/$slotname3"
151152

152153
printf "\nValidating cloned web app slot %s " "$slotname3"
153154
[ $(echo $slotClone | jq '.name' --raw-output) == "$appWithSlotNameClone" ]
154155

155156
printf "\nValidating web app slot get for %s " "$slotname3"
156-
slotClone=`az webapp slot get -g "$groupName" -n "$appName2" --slot "$slotname3"`
157+
slotClone=`az webapp slot get -g "$groupName" -n "$appName3" --slot "$slotname3"`
157158
[ $(echo $slotClone | jq '.name' --raw-output) == "$appWithSlotNameClone" ]
158159

159160
printf "\n20. Create a new web app for clone testing"
160-
slot2=`az webapp slot create -g "$groupName" --plan "$planName2" -n "$appName2" --slot "$slotname3"`
161-
slotN1="$appName2/$slotname3"
161+
slot2=`az webapp slot create -g "$groupName" --plan "$planName1" -n "$appName3" --slot "$slotname3"`
162162

163163
printf "\n21. Create a new web app for clone testing"
164164
servicePlan=`az app service plan create -n "$planName3" -g "$groupName" -l "$location1" --tier "$tier2"`
165-
webappInfo3=`az webapp create -g "$groupName" -n "$appName3" -l "$location1" --plan "$planName3"`
166-
slot3=`az webapp slot create -g "$groupName" -n "$appName3" --slot "$slotname3" --sourcewebapp "$webappInfo3"`
165+
webappInfo3=`az webapp create -g "$groupName" -n "$appName4" -l "$location1" --plan "$planName3"`
166+
slot3=`az webapp slot create -g "$groupName" --plan "$planName3" -n "$appName4" --slot "$slotname3" --sourcewebapp "$slot2"`
167167

168168
printf "\nValidating web app slot get for %s " "$slotname3"
169-
appWithSlotName3="$appName3/$slotname3"
169+
appWithSlotName3="$appName4/$slotname3"
170170
[ $(echo $slot3 | jq '.name' --raw-output) == "$appWithSlotName3" ]
171171

172172
# Cleanup

src/CLU/Commands.Common.ScenarioTest/ExamplesTests/WebsitesTests.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ public void WebAppSlotTest()
3939
helper.EnvironmentVariables.Add("appName1", helper.GenerateName("testweb"));
4040
helper.EnvironmentVariables.Add("appName2", helper.GenerateName("testweb"));
4141
helper.EnvironmentVariables.Add("appName3", helper.GenerateName("testweb"));
42+
helper.EnvironmentVariables.Add("appName4", helper.GenerateName("testweb"));
4243
helper.EnvironmentVariables.Add("planName1", helper.GenerateName("testplan"));
4344
helper.EnvironmentVariables.Add("planName2", helper.GenerateName("testplan"));
4445
helper.EnvironmentVariables.Add("planName3", helper.GenerateName("testplan"));

0 commit comments

Comments
 (0)