Skip to content
This repository has been archived by the owner on Dec 17, 2021. It is now read-only.

Commit

Permalink
fix: build fix
Browse files Browse the repository at this point in the history
  • Loading branch information
weliasz committed Sep 24, 2021
1 parent f33a02e commit 44dbdb6
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 9 deletions.
7 changes: 4 additions & 3 deletions splunk_connect_for_snmp_mib_server/profiles.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,10 @@
# ########################################################################
import logging
import os
import yaml

from yaml.parser import ParserError

import yaml

logger = logging.getLogger(__name__)

def merge_profiles(directory, root_name):
Expand All @@ -32,7 +31,9 @@ def merge_profiles(directory, root_name):
data = yaml.safe_load(stream)
merged_profiles.update(data[root_name])
except ParserError as pe:
logger.warning(f"Error while parsing file {os.path.join(root, name)} : {pe}")
logger.warning(
f"Error while parsing file {os.path.join(root, name)} : {pe}"
)

result[root_name] = merged_profiles
return result
20 changes: 14 additions & 6 deletions tests/test_profile_merge.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@

class ProfileLoaderTest(TestCase):
def test_multiple_files_merging(self):
merged_profiles = merge_profiles("tests/profiles/two_profiles", "profiles")["profiles"]
merged_profiles = merge_profiles("tests/profiles/two_profiles", "profiles")[
"profiles"
]

assert len(merged_profiles.keys()) == 4
assert "basev1" in merged_profiles.keys()
Expand All @@ -30,24 +32,30 @@ def test_multiple_files_merging(self):
assert "basev2l2" in merged_profiles.keys()

def test_one_file(self):
merged_profiles = merge_profiles("tests/profiles/one_profile", "profiles")["profiles"]
merged_profiles = merge_profiles("tests/profiles/one_profile", "profiles")[
"profiles"
]

assert len(merged_profiles.keys()) == 2
assert "basev1" in merged_profiles.keys()
assert "basev1l2" in merged_profiles.keys()

def test_same_name_profiles_were_overwritten_in_alphabetical_order(self):
merged_profiles = merge_profiles("tests/profiles/same_name_profiles", "profiles")["profiles"]
merged_profiles = merge_profiles("tests/profiles/same_name_profiles", "profiles")[
"profiles"
]

assert len(merged_profiles.keys()) == 2
assert "basev1" in merged_profiles.keys()
assert "basev1l2" in merged_profiles.keys()

assert merged_profiles['basev1']['frequency'] == 60
assert merged_profiles['basev1l2']['frequency'] == 120
assert merged_profiles["basev1"]["frequency"] == 60
assert merged_profiles["basev1l2"]["frequency"] == 120

def test_malformed_file_is_ignored(self):
merged_profiles = merge_profiles("tests/profiles/malformed_profile", "profiles")["profiles"]
merged_profiles = merge_profiles(
"tests/profiles/malformed_profile", "profiles"
)["profiles"]

assert len(merged_profiles.keys()) == 2
assert "basev2" in merged_profiles.keys()
Expand Down

0 comments on commit 44dbdb6

Please sign in to comment.