Skip to content

Commit

Permalink
Merge branch 'main' into adding_apple_platform_fields_stage2
Browse files Browse the repository at this point in the history
  • Loading branch information
txhaflaire authored Aug 29, 2024
2 parents d609b6f + e3e73de commit eb96731
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion scripts/requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# License: MIT
autopep8==1.6.0
autopep8==2.3.1
# License: BSD
mock==5.1.0
# License: GPLv3
Expand Down
2 changes: 1 addition & 1 deletion scripts/schema/subset_filter.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ def remove_docs_only_entries(paths: List[str], fields: Dict[str, FieldEntry]) ->
split_path = path.split('.')
field_set = split_path[0]
field = split_path[1]
del(fields[field_set]['fields'][field])
del (fields[field_set]['fields'][field])
return fields


Expand Down
2 changes: 1 addition & 1 deletion scripts/tests/test_asciidoc_fields.py
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ def dummy_nested_event_fieldset(self):

def test_validate_sort_fieldset(self):
sorted_foo_fields = asciidoc_fields.sort_fields(self.foo_fieldset)
#import pdb;pdb.set_trace()
# import pdb;pdb.set_trace()
self.assertIsInstance(sorted_foo_fields, list)

# `allowed_value_names` always present
Expand Down
2 changes: 1 addition & 1 deletion scripts/tests/test_ecs_helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ def test_glob_yaml_files(self):
self.assertEqual(ecs_helpers.glob_yaml_files('non_existent_wildcard.*'), [])
self.assertEqual(ecs_helpers.glob_yaml_files('schemas/base.yml'), ['schemas/base.yml'])
self.assertEqual(ecs_helpers.glob_yaml_files(['schemas/base.yml']), ['schemas/base.yml'])
# convert to set as element order is not being tested
#  convert to set as element order is not being tested
self.assertEqual(set(ecs_helpers.glob_yaml_files(
['schemas/base.yml', 'schemas/log.yml'])), {'schemas/base.yml', 'schemas/log.yml'})
self.assertTrue(set(ecs_helpers.glob_yaml_files('schemas/b*.yml')).intersection({'schemas/base.yml'}) != set())
Expand Down

0 comments on commit eb96731

Please sign in to comment.