windows: removed deprecated features in 2.6 (#38930)

* windows: removed deprecated features in 2.6

* Comma surgery.

test/integration/targets/win_feature/tasks/main.yml

@@ -32,7 +32,6 @@
   win_feature:
     name: "{{ test_win_feature_name }}"
     state: present
-    restart: no
     include_sub_features: yes
     include_management_tools: yes
   register: win_feature_install_result
@@ -44,12 +43,12 @@
       - "win_feature_install_result is changed"
       - "win_feature_install_result.success"
       - "win_feature_install_result.exitcode == 'Success'"
-      - "not win_feature_install_result.restart_needed"
+      - "not win_feature_install_result.reboot_required"
       - "win_feature_install_result.feature_result|length == 1"
       - "win_feature_install_result.feature_result[0].id"
       - "win_feature_install_result.feature_result[0].display_name"
       - "win_feature_install_result.feature_result[0].message is defined"
-      - "win_feature_install_result.feature_result[0].restart_needed is defined"
+      - "win_feature_install_result.feature_result[0].reboot_required is defined"
       - "win_feature_install_result.feature_result[0].skip_reason"
       - "win_feature_install_result.feature_result[0].success is defined"
   when: win_feature_has_servermanager is successful
@@ -58,7 +57,6 @@
   win_feature:
     name: "{{ test_win_feature_name }}"
     state: present
-    restart: no
     include_sub_features: yes
     include_management_tools: yes
   register: win_feature_install_again_result
@@ -70,7 +68,7 @@
       - "win_feature_install_again_result is not changed"
       - "win_feature_install_again_result.success"
       - "win_feature_install_again_result.exitcode == 'NoChangeNeeded'"
-      - "not win_feature_install_again_result.restart_needed"
+      - "not win_feature_install_again_result.reboot_required"
       - "win_feature_install_again_result.feature_result == []"
   when: win_feature_has_servermanager is successful
 
@@ -87,12 +85,12 @@
       - "win_feature_remove_result is changed"
       - "win_feature_remove_result.success"
       - "win_feature_remove_result.exitcode == 'Success'"
-      - "not win_feature_remove_result.restart_needed"
+      - "not win_feature_remove_result.reboot_required"
       - "win_feature_remove_result.feature_result|length == 1"
       - "win_feature_remove_result.feature_result[0].id"
       - "win_feature_remove_result.feature_result[0].display_name"
       - "win_feature_remove_result.feature_result[0].message is defined"
-      - "win_feature_remove_result.feature_result[0].restart_needed is defined"
+      - "win_feature_remove_result.feature_result[0].reboot_required is defined"
       - "win_feature_remove_result.feature_result[0].skip_reason"
       - "win_feature_remove_result.feature_result[0].success is defined"
   when: win_feature_has_servermanager is successful
@@ -110,7 +108,7 @@
       - "win_feature_remove_again_result is not changed"
       - "win_feature_remove_again_result.success"
       - "win_feature_remove_again_result.exitcode == 'NoChangeNeeded'"
-      - "not win_feature_remove_again_result.restart_needed"
+      - "not win_feature_remove_again_result.reboot_required"
       - "win_feature_remove_again_result.feature_result == []"
   when: win_feature_has_servermanager is successful
 

test/integration/targets/win_iis_webapppool/tasks/main.yml

@@ -9,15 +9,10 @@
 
 # Run actual tests
 - block:
-  # Setup for tests
-  - name: this is too finicky reboot before feature install
-    win_reboot:
-
   - name: ensure IIS features are installed
     win_feature:
       name: Web-Server
       state: present
-      includ_sub_features: True
       include_management_tools: True
     register: feature_install
   
@@ -45,17 +40,4 @@
     win_iis_webapppool:
       name: '{{test_iis_webapppool_name}}'
       state: absent
-
-  - name: remove IIS features after test
-    win_feature:
-      name: Web-Server
-      state: absent
-      includ_sub_features: True
-      include_management_tools: True
-    register: feature_uninstall
-  
-  - name: reboot after feature install
-    win_reboot:
-    when: feature_uninstall.reboot_required
-
   when: module_available.rc == 0

test/integration/targets/win_iis_webapppool/tasks/tests.yml

@@ -93,49 +93,6 @@
     - change_pool_attributes_again is not changed
     - change_pool_attributes_again.info == change_pool_attributes.info
 
-- name: change attributes of pool (old style) check
-  win_iis_webapppool:
-    name: '{{test_iis_webapppool_name}}'
-    state: present
-    attributes: "managedPipelineMode:0|startMode:OnDemand|cpu.limit:0|processModel.identityType:NetworkService"
-  register: change_pool_attributes_deprecated_check
-  check_mode: yes
-
-- name: assert change attributes of pool (old style) check
-  assert:
-    that:
-    - change_pool_attributes_deprecated_check is changed
-    - change_pool_attributes_deprecated_check.info == change_pool_attributes_again.info
-
-- name: change attributes of pool (old style)
-  win_iis_webapppool:
-    name: '{{test_iis_webapppool_name}}'
-    state: present
-    attributes: "managedPipelineMode:0|startMode:OnDemand|cpu.limit:10|processModel.identityType:NetworkService"
-  register: change_pool_attributes_deprecated
-
-- name: assert change attributes of pool (old style)
-  assert:
-    that:
-    - change_pool_attributes_deprecated is changed
-    - change_pool_attributes_deprecated.info.attributes.managedPipelineMode == 'Integrated'
-    - change_pool_attributes_deprecated.info.attributes.startMode == 'OnDemand'
-    - change_pool_attributes_deprecated.info.cpu.limit == 10
-    - change_pool_attributes_deprecated.info.processModel.identityType == 'NetworkService'
-
-- name: change attributes of pool (old style) again
-  win_iis_webapppool:
-    name: '{{test_iis_webapppool_name}}'
-    state: present
-    attributes: "managedPipelineMode:0|startMode:OnDemand|cpu.limit:10|processModel.identityType:NetworkService"
-  register: change_pool_attributes_deprecated_again
-
-- name: assert change attributes of pool (old style) again
-  assert:
-    that:
-    - change_pool_attributes_deprecated_again is not changed
-    - change_pool_attributes_deprecated_again.info == change_pool_attributes_deprecated.info
-
 - name: change more complex variables check
   win_iis_webapppool:
     name: '{{test_iis_webapppool_name}}'
@@ -152,7 +109,7 @@
   assert:
     that:
     - change_complex_attributes_check is changed
-    - change_complex_attributes_check.info == change_pool_attributes_deprecated_again.info
+    - change_complex_attributes_check.info == change_pool_attributes_again.info
 
 - name: change more complex variables
   win_iis_webapppool:

test/integration/targets/win_package/tasks/msi_tests.yml

@@ -29,7 +29,6 @@
   win_package:
     path: '{{test_win_package_path}}\good.msi'
     state: present
-    expected_return_code: "" # historical, an empty string means 0, 3010
   register: install_local_msi
 
 - name: get result of install local msi