test: live test fixes in appservice, vm, resource

src/command_modules/azure-cli-acs/azure/cli/command_modules/acs/tests/latest/test_aks_commands.py

@@ -266,6 +266,7 @@ def test_aks_bad_inputs(self, resource_group, resource_group_location, sp_name,
             self.cmd(create_cmd)
         self.assertIn('--max-pods', str(err.exception))
 
+    @AllowLargeResponse(8192)
     @ResourceGroupPreparer(random_name_length=17, name_prefix='clitest', location='eastus')
     @RoleBasedServicePrincipalPreparer()
     def test_aks_create_default_service_without_skip_role_assignment(self, resource_group, resource_group_location, sp_name, sp_password):
@@ -308,6 +309,7 @@ def test_aks_create_default_service_without_skip_role_assignment(self, resource_
             self.check('provisioningState', 'Succeeded')
         ])
 
+    @AllowLargeResponse(8192)
     @ResourceGroupPreparer(random_name_length=17, name_prefix='clitest', location='eastus')
     @RoleBasedServicePrincipalPreparer()
     def test_aks_create_default_service_with_skip_role_assignment(self, resource_group, resource_group_location, sp_name, sp_password):

src/command_modules/azure-cli-appservice/HISTORY.rst

@@ -2,6 +2,9 @@
 
 Release History
 ===============
+0.2.8
++++++
+* webapp: fix a bug on container based windows app due to backend change
 
 0.2.7
 +++++

src/command_modules/azure-cli-appservice/azure/cli/command_modules/appservice/custom.py

@@ -1088,7 +1088,7 @@ def create_app_service_plan(cmd, resource_group_name, name, is_linux, hyper_v, s
     # the api is odd on parameter naming, have to live with it for now
     sku_def = SkuDescription(tier=get_sku_name(sku), name=sku, capacity=number_of_workers)
     plan_def = AppServicePlan(location=location, tags=tags, sku=sku_def,
-                              reserved=(is_linux or None), is_xenon=(hyper_v or None), name=name)
+                              reserved=(is_linux or None), hyper_v=(hyper_v or None), name=name)
     return client.app_service_plans.create_or_update(resource_group_name, name, plan_def)
 
 

src/command_modules/azure-cli-appservice/azure/cli/command_modules/appservice/tests/latest/test_webapp_commands.py

@@ -160,11 +160,11 @@ def test_linux_webapp_multicontainer_create(self, resource_group):
 
     @ResourceGroupPreparer(location='japanwest')
     def test_linux_webapp_quick_create_cd(self, resource_group):
-        webapp_name = 'webapp-quick-linux-cd'
+        webapp_name = self.create_random_name(prefix='webapp-linux-cd', length=24)
         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 https://github.com/yugangw-msft/azure-site-test.git -r "node|6.11"'.format(resource_group, webapp_name, plan))
-        time.sleep(30)  # 30 seconds should be enough for the deployment finished(Skipped under playback mode)
+        time.sleep(45)  # 45 seconds should be enough for the deployment finished(Skipped under playback mode)
         r = requests.get('http://{}.azurewebsites.net'.format(webapp_name), timeout=240)
         # verify the web page
         if 'Hello world' not in str(r.content):
@@ -702,7 +702,7 @@ def test_webapp_ssl(self, resource_group, resource_group_location):
 
 
 class WebappUndeleteTest(ScenarioTest):
-    @AllowLargeResponse()
+    @AllowLargeResponse(8192)
     @ResourceGroupPreparer()
     def test_webapp_deleted_list(self, resource_group):
         plan = self.create_random_name(prefix='delete-me-plan', length=24)
@@ -714,18 +714,6 @@ def test_webapp_deleted_list(self, resource_group):
             JMESPathCheck('[0].deletedSiteName', webapp_name)
         ])
 
-    @AllowLargeResponse()
-    @ResourceGroupPreparer()
-    def test_webapp_deleted_restore(self, resource_group):
-        plan = self.create_random_name(prefix='undelete-plan', length=24)
-        webapp_name = self.create_random_name(prefix='undelete-web', length=24)
-        self.cmd('appservice plan create -g {} -n {} --sku B1 --tags plan=plan1'.format(resource_group, plan))
-        self.cmd('webapp create -g {} -n {} --plan {}'.format(resource_group, webapp_name, plan))
-        # A snapshot must be available to restore a deleted app. The app must exist for at least an hour prior to deletion to have a snapshot.
-        # Using a pre-configured deleted app in this test.
-        deleted_app_id = self.cmd('webapp deleted list -g {} -n {}'.format('nicking', 'nickingdeletedwordpress')).get_output_in_json()[0]['id']
-        self.cmd('webapp deleted restore --deleted-id {} -g {} -n {}'.format(deleted_app_id, resource_group, webapp_name))
-
 
 class FunctionAppWithPlanE2ETest(ScenarioTest):
     @ResourceGroupPreparer()
@@ -935,8 +923,9 @@ def test_webapp_list_locations_free_sku(self, resource_group):
 
 
 class WebappTriggeredWebJobListTest(ScenarioTest):
-    @ResourceGroupPreparer()
+
     @record_only()
+    @ResourceGroupPreparer()
     def test_webapp_triggeredWebjob_list(self, resource_group):
         # testing this using a webjob already created
         # given there is no create command inorder to re-record please create a webjob before

src/command_modules/azure-cli-appservice/setup.py

@@ -14,7 +14,7 @@
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
     cmdclass = {}
 
-VERSION = "0.2.7"
+VERSION = "0.2.8"
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',
     'Intended Audience :: Developers',

src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/tests/latest/test_resource.py

@@ -538,6 +538,7 @@ def test_resource_move(self, resource_group, resource_group_dest):
 
 class FeatureScenarioTest(ScenarioTest):
 
+    @AllowLargeResponse(8192)
     def test_feature_list(self):
         self.cmd('feature list', checks=self.check("length([?name=='Microsoft.Xrm/uxdevelopment'])", 1))