Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ def test_win_webapp_quick_create(self, resource_group):
self.assertTrue(r['ftpPublishingUrl'].startswith('ftps://'))
self.cmd('webapp config appsettings list -g {} -n {}'.format(resource_group, webapp_name), checks=[
JMESPathCheck('[0].name', 'WEBSITE_NODE_DEFAULT_VERSION'),
JMESPathCheck('[0].value', '~20'),
JMESPathCheck('[0].value', '~22'),
])

@AllowLargeResponse()
Expand All @@ -161,12 +161,12 @@ def test_win_webapp_quick_create_runtime(self, resource_group):
webapp_name_2 = self.create_random_name(prefix='webapp-quick', length=24)
plan = self.create_random_name(prefix='plan-quick', length=24)
self.cmd('appservice plan create -g {} -n {}'.format(resource_group, plan))
r = self.cmd('webapp create -g {} -n {} --plan {} --deployment-local-git -r "node|20LTS"'.format(
r = self.cmd('webapp create -g {} -n {} --plan {} --deployment-local-git -r "node|22LTS"'.format(
resource_group, webapp_name, plan)).get_output_in_json()
self.assertTrue(r['ftpPublishingUrl'].startswith('ftps://'))
self.cmd('webapp config appsettings list -g {} -n {}'.format(resource_group, webapp_name), checks=[
JMESPathCheck('[0].name', 'WEBSITE_NODE_DEFAULT_VERSION'),
JMESPathCheck('[0].value', '~20'),
JMESPathCheck('[0].value', '~22'),
])
r = self.cmd('webapp create -g {} -n {} --plan {} --deployment-local-git -r "dotnet:8"'.format(
resource_group, webapp_name_2, plan)).get_output_in_json()
Expand All @@ -178,7 +178,7 @@ def test_win_webapp_quick_create_cd(self, resource_group):
webapp_name = self.create_random_name(prefix='webapp-quick-cd', length=24)
plan = self.create_random_name(prefix='plan-quick', length=24)
self.cmd('appservice plan create -g {} -n {}'.format(resource_group, plan))
self.cmd('webapp create -g {} -n {} --plan {} --deployment-source-url {} -r "node|20LTS"'.format(
self.cmd('webapp create -g {} -n {} --plan {} --deployment-source-url {} -r "node|22LTS"'.format(
resource_group, webapp_name, plan, TEST_REPO_URL))
# 30 seconds should be enough for the deployment finished(Skipped under playback mode)
time.sleep(30)
Expand Down Expand Up @@ -231,7 +231,7 @@ def test_linux_webapp_quick_create_cd(self, resource_group):
plan = 'plan-quick-linux-cd'
self.cmd(
'appservice plan create -g {} -n {} --is-linux'.format(resource_group, plan))
self.cmd('webapp create -g {} -n {} --plan {} -u {} -r "NODE|20-lts"'.format(resource_group, webapp_name,
self.cmd('webapp create -g {} -n {} --plan {} -u {} -r "NODE|22-lts"'.format(resource_group, webapp_name,
plan, TEST_REPO_URL))
# 45 seconds should be enough for the deployment finished(Skipped under playback mode)
time.sleep(45)
Expand Down Expand Up @@ -486,7 +486,7 @@ def test_download_win_web_log(self, resource_group):
prefix='webapp-win-log', length=24)
plan = self.create_random_name(prefix='win-log', length=24)
self.cmd(f'appservice plan create -g {resource_group} -n {plan} -l eastus')
self.cmd('webapp create -g {} -n {} --plan {} --deployment-source-url {} -r "node|20LTS"'.format(
self.cmd('webapp create -g {} -n {} --plan {} --deployment-source-url {} -r "node|22LTS"'.format(
resource_group, webapp_name, plan, TEST_REPO_URL))
# 30 seconds should be enough for the deployment finished(Skipped under playback mode)
time.sleep(30)
Expand Down Expand Up @@ -808,7 +808,7 @@ def test_webapp_config(self, resource_group):
JMESPathCheck('[0].name', '{0}.azurewebsites.net'.format(webapp_name))])

# site azure storage account configurations tests
runtime = 'NODE|20-lts'
runtime = 'NODE|22-lts'
linux_plan = self.create_random_name(
prefix='webapp-linux-plan', length=24)
linux_webapp = self.create_random_name(
Expand Down Expand Up @@ -919,9 +919,9 @@ def test_webapp_config(self, resource_group):
JMESPathCheck("javaContainer", None),
JMESPathCheck("javaContainerVersion", None),
])
self.cmd('webapp config set -g {} -n {} --runtime NODE:20LTS'.format(resource_group, webapp_name))
self.cmd('webapp config set -g {} -n {} --runtime NODE:22LTS'.format(resource_group, webapp_name))
self.cmd('webapp config appsettings list -g {} -n {}'.format(resource_group, webapp_name)).assert_with_checks([
JMESPathCheck("[?name=='WEBSITE_NODE_DEFAULT_VERSION']|[0].value", "~20"),
JMESPathCheck("[?name=='WEBSITE_NODE_DEFAULT_VERSION']|[0].value", "~22"),
])
#linux
self.cmd('webapp config set -g {} -n {} --runtime TOMCAT:11.0-java21'.format(resource_group, linux_webapp)).assert_with_checks([
Expand All @@ -948,11 +948,11 @@ def test_webapp_config(self, resource_group):
self.cmd('webapp config show -g {} -n {}'.format(resource_group, linux_webapp)).assert_with_checks([
JMESPathCheck("linuxFxVersion", "DOTNETCORE|8.0"),
])
self.cmd('webapp config set -g {} -n {} --runtime NODE:20-lts'.format(resource_group, linux_webapp)).assert_with_checks([
JMESPathCheck("linuxFxVersion", "NODE|20-lts"),
self.cmd('webapp config set -g {} -n {} --runtime NODE:22-lts'.format(resource_group, linux_webapp)).assert_with_checks([
JMESPathCheck("linuxFxVersion", "NODE|22-lts"),
])
self.cmd('webapp config show -g {} -n {}'.format(resource_group, linux_webapp)).assert_with_checks([
JMESPathCheck("linuxFxVersion", "NODE|20-lts"),
JMESPathCheck("linuxFxVersion", "NODE|22-lts"),
])

@AllowLargeResponse()
Expand Down Expand Up @@ -1262,7 +1262,7 @@ class LinuxWebappScenarioTest(ScenarioTest):
@AllowLargeResponse()
@ResourceGroupPreparer(location=LINUX_ASP_LOCATION_WEBAPP)
def test_linux_webapp(self, resource_group):
runtime = 'NODE|20-lts'
runtime = 'NODE|22-lts'
plan = self.create_random_name(prefix='webapp-linux-plan', length=24)
webapp = self.create_random_name(prefix='webapp-linux', length=24)
self.cmd('appservice plan create -g {} -n {} --sku S1 --is-linux' .format(resource_group, plan), checks=[
Expand Down Expand Up @@ -1348,7 +1348,7 @@ def test_linux_webapp_ssh(self, resource_group):
if platform.system() == "Windows":
return

runtime = 'node|20-lts'
runtime = 'node|22-lts'
plan = self.create_random_name(prefix='webapp-ssh-plan', length=24)
webapp = self.create_random_name(prefix='webapp-ssh', length=24)
self.cmd(
Expand All @@ -1367,7 +1367,7 @@ class LinuxWebappRemoteSSHScenarioTest(ScenarioTest):
@AllowLargeResponse()
@ResourceGroupPreparer(location=LINUX_ASP_LOCATION_WEBAPP)
def test_linux_webapp_remote_ssh(self, resource_group):
runtime = 'node|20-lts'
runtime = 'node|22-lts'
plan = self.create_random_name(
prefix='webapp-remote-ssh-plan', length=40)
webapp = self.create_random_name(prefix='webapp-remote-ssh', length=40)
Expand Down Expand Up @@ -1430,7 +1430,7 @@ class WebappACRScenarioTest(ScenarioTest):
def test_acr_integration(self, resource_group):
plan = self.create_random_name(prefix='acrtestplan', length=24)
webapp = self.create_random_name(prefix='webappacrtest', length=24)
runtime = 'NODE|20-lts'
runtime = 'NODE|22-lts'
acr_registry_name = webapp
self.cmd('acr create --admin-enabled -g {} -n {} --sku Basic'.format(
resource_group, acr_registry_name))
Expand Down Expand Up @@ -2515,7 +2515,7 @@ def test_webapp_create_linux_free(self, resource_group):
# this weird field means it is a linux
JMESPathCheck('reserved', True),
JMESPathCheck('sku.tier', 'LinuxFree')])
self.cmd('webapp create -g {} -n {} --plan {} -u {} -r "NODE|20-lts"'.format(resource_group, webapp_name, plan,
self.cmd('webapp create -g {} -n {} --plan {} -u {} -r "NODE|22-lts"'.format(resource_group, webapp_name, plan,
TEST_REPO_URL))
# verify alwaysOn
self.cmd('webapp config show -g {} -n {}'.format(resource_group, webapp_name)).assert_with_checks([
Expand Down Expand Up @@ -2597,7 +2597,7 @@ def test_webapp_linux_acr_use_identity(self, resource_group):
plan = self.create_random_name(prefix='plan-linux', length=24)

self.cmd('appservice plan create -g {} -n {} --is-linux'.format(resource_group, plan))
self.cmd('webapp create -g {} -n {} --plan {} -u {} -r "NODE|20-lts" --assign-identity [system] --acr-use-identity --acr-identity [system]'
self.cmd('webapp create -g {} -n {} --plan {} -u {} -r "NODE|22-lts" --assign-identity [system] --acr-use-identity --acr-identity [system]'
.format(resource_group, system_identity_webapp_name, plan, TEST_REPO_URL), checks=[
JMESPathCheck('state', 'Running'),
JMESPathCheck('name', system_identity_webapp_name),
Expand All @@ -2606,15 +2606,15 @@ def test_webapp_linux_acr_use_identity(self, resource_group):

self.cmd('webapp config show -g {} -n {}'.format(resource_group, system_identity_webapp_name), checks=[
JMESPathCheck('windowsFxVersion', None),
JMESPathCheck('linuxFxVersion', "NODE|20-lts"),
JMESPathCheck('linuxFxVersion', "NODE|22-lts"),
JMESPathCheck('acrUseManagedIdentityCreds', True)
])

user_identity_webapp_name = self.create_random_name(prefix='webapp-linux', length=24)
identity_name = self.create_random_name('app-linux', 16)
msi_result = self.cmd('identity create -g {} -n {}'.format(
resource_group, identity_name)).get_output_in_json()
self.cmd('webapp create -g {} -n {} --plan {} -u {} -r "NODE|20-lts" --assign-identity {} --acr-use-identity --acr-identity {}'
self.cmd('webapp create -g {} -n {} --plan {} -u {} -r "NODE|22-lts" --assign-identity {} --acr-use-identity --acr-identity {}'
.format(resource_group, user_identity_webapp_name, plan, TEST_REPO_URL, msi_result['id'], msi_result['id']), checks=[
JMESPathCheck('state', 'Running'),
JMESPathCheck('name', user_identity_webapp_name),
Expand All @@ -2623,7 +2623,7 @@ def test_webapp_linux_acr_use_identity(self, resource_group):

self.cmd('webapp config show -g {} -n {}'.format(resource_group, user_identity_webapp_name), checks=[
JMESPathCheck('windowsFxVersion', None),
JMESPathCheck('linuxFxVersion', "NODE|20-lts"),
JMESPathCheck('linuxFxVersion', "NODE|22-lts"),
JMESPathCheck('acrUseManagedIdentityCreds', True),
JMESPathCheck('acrUserManagedIdentityId', msi_result['clientId'])
])
Expand Down Expand Up @@ -3314,7 +3314,7 @@ def test_webapp_track_runtimestatus_buildfailed(self, resource_group):
self.cmd(
'appservice plan create -g {} -n {} --sku S1 --is-linux'.format(resource_group, plan_name))
self.cmd(
'webapp create -g {} -n {} --plan {} -r "NODE|20-LTS"'.format(resource_group, webapp_name, plan_name))
'webapp create -g {} -n {} --plan {} -r "NODE|22-LTS"'.format(resource_group, webapp_name, plan_name))
with self.assertRaisesRegex(CLIError, "Deployment failed because the build process failed"):
self.cmd('webapp deploy -g {} --n {} --src-path "{}" --type zip --async'.format(resource_group, webapp_name, zip_file))

Expand All @@ -3327,7 +3327,7 @@ def test_webapp_track_runtimestatus_runtimefailed(self, resource_group):
self.cmd(
'appservice plan create -g {} -n {} --sku S1 --is-linux'.format(resource_group, plan_name))
self.cmd(
'webapp create -g {} -n {} --plan {} -r "NODE|20-LTS"'.format(resource_group, webapp_name, plan_name))
'webapp create -g {} -n {} --plan {} -r "NODE|22-LTS"'.format(resource_group, webapp_name, plan_name))
with self.assertRaisesRegex(CLIError, "Deployment failed because the site failed to start within 10 mins."):
self.cmd('webapp deploy -g {} --n {} --src-path "{}" --type zip --async'.format(resource_group, webapp_name, zip_file))

Expand Down Expand Up @@ -3375,7 +3375,7 @@ def test_webapp_deployment_source_track_runtimestatus_buildfailed(self, resource
self.cmd(
'appservice plan create -g {} -n {} --sku S1 --is-linux'.format(resource_group, plan_name))
self.cmd(
'webapp create -g {} -n {} --plan {} -r "NODE|20-LTS"'.format(resource_group, webapp_name, plan_name))
'webapp create -g {} -n {} --plan {} -r "NODE|22-LTS"'.format(resource_group, webapp_name, plan_name))
with self.assertRaisesRegex(CLIError, "Deployment failed because the build process failed"):
self.cmd('webapp deployment source config-zip -g {} --n {} --src "{}"'.format(resource_group, webapp_name, zip_file))

Expand All @@ -3388,7 +3388,7 @@ def test_webapp_deployment_source_track_runtimestatus_runtimefailed(self, resour
self.cmd(
'appservice plan create -g {} -n {} --sku S1 --is-linux'.format(resource_group, plan_name))
self.cmd(
'webapp create -g {} -n {} --plan {} -r "NODE|20-LTS"'.format(resource_group, webapp_name, plan_name))
'webapp create -g {} -n {} --plan {} -r "NODE|22-LTS"'.format(resource_group, webapp_name, plan_name))
with self.assertRaisesRegex(CLIError, "Deployment failed because the site failed to start within 10 mins."):
self.cmd('webapp deployment source config-zip -g {} --n {} --src "{}"'.format(resource_group, webapp_name, zip_file))

Expand Down
Loading
Loading