Merge remote-tracking branch 'upstream/master' into feature/remove-eo…

…l-os

* upstream/master:
  Revert elastic#105

roles/test-beat/tasks/common/assert.yml

@@ -99,37 +99,3 @@
     - "version is version_compare('6.5', '>=')"
     - ansible_system == "Linux"
     - "project != 'apm-server'"
-
-- name: 'Get {{ beat_name }} help output for an unknown help topic'
-  shell: '{{ beat_name }} help non_existing_topic'
-  register: test_cmd_result
-
-- name: 'Check that {{ beat_name }} reports unknown help topics'
-  assert:
-    that:
-      - "'Unknown help topic [`non_existing_topic`]' in test_cmd_result.stderr"
-
-- name: 'Get {{ beat_name }} help output for an X-Pack feature'
-  shell: '{{ beat_name }} help enroll'
-  register: xpack_cmd_result
-  # The enroll command appeared in 6.5.
-  when:
-      - "version is version_compare('6.5', '>=')"
-
-- name: 'Check that {{ beat_name }} contains X-Pack features'
-  assert:
-    that:
-      - "'Unknown help topic' not in xpack_cmd_result.stderr"
-  when:
-    - "version is version_compare('6.5', '>=')"
-    - "'oss' not in beat_pkg_suffix"
-    - "project != 'apm-server'"
-
-- name: 'Check that {{ beat_name }} contains OSS features only'
-  assert:
-    that:
-      - "'Unknown help topic [`enroll`]' in xpack_cmd_result.stderr"
-  when:
-    - "version is version_compare('6.5', '>=')"
-    - "'oss' in beat_pkg_suffix"
-    - "project != 'apm-server'"