3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Remove config_section parameter

Browse source 
Just always take 'profile'. We don't need to test with anything else. Just adjust the data to it.

Contributes to issue CURA-5929.
This commit is contained in:
Ghostkeeper 2018-11-12 13:49:13 +01:00
parent e18ea4bca4
commit 7e87a303cb
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
1 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

23
plugins/LegacyProfileReader/tests/TestLegacyProfileReader.py
View file

@ -41,7 +41,6 @@ test_prepareLocalsData = [
"infill_density": "30" "infill_density": "30"
} }
}, },
"profile", # Config section.
{ # Defaults. { # Defaults.
"layer_height": "0.1", "layer_height": "0.1",
"infill_density": "20", "infill_density": "20",
@ -54,7 +53,6 @@ test_prepareLocalsData = [
{ {
} }
}, },
"profile", # Config section.
{ # Defaults. { # Defaults.
} }
), ),
@ -64,7 +62,6 @@ test_prepareLocalsData = [
{ {
} }
}, },
"profile", # Config section.
{ # Defaults. { # Defaults.
"foo": "bar", "foo": "bar",
"boo": "far" "boo": "far"
@ -81,25 +78,24 @@ test_prepareLocalsData = [
"foo": "baz" #Not the same as in some_other_name "foo": "baz" #Not the same as in some_other_name
} }
}, },
"profile", # Config section.
{ # Defaults. { # Defaults.
"foo": "bla" "foo": "bla"
} }
) )
] ]
@pytest.mark.parametrize("parser_data, config_section, defaults", test_prepareLocalsData) @pytest.mark.parametrize("parser_data, defaults", test_prepareLocalsData)
def test_prepareLocals(legacy_profile_reader, parser_data, config_section, defaults): def test_prepareLocals(legacy_profile_reader, parser_data, defaults):
parser = configparser.ConfigParser() parser = configparser.ConfigParser()
parser.read_dict(parser_data) parser.read_dict(parser_data)
output = legacy_profile_reader.prepareLocals(parser, config_section, defaults) output = legacy_profile_reader.prepareLocals(parser, "profile", defaults)
assert set(defaults.keys()) <= set(output.keys()) # All defaults must be in there. assert set(defaults.keys()) <= set(output.keys()) # All defaults must be in there.
assert set(parser_data[config_section]) <= set(output.keys()) # All overwritten values must be in there. assert set(parser_data["profile"]) <= set(output.keys()) # All overwritten values must be in there.
for key in output: for key in output:
if key in parser_data[config_section]: if key in parser_data["profile"]:
assert output[key] == parser_data[config_section][key] # If overwritten, must be the overwritten value. assert output[key] == parser_data["profile"][key] # If overwritten, must be the overwritten value.
else: else:
assert output[key] == defaults[key] # Otherwise must be equal to the default. assert output[key] == defaults[key] # Otherwise must be equal to the default.
@ -111,7 +107,6 @@ test_prepareLocalsNoSectionErrorData = [
"foo": "bar" "foo": "bar"
}, },
}, },
"profile", # Config section.
{ # Defaults. { # Defaults.
"foo": "baz" "foo": "baz"
} }
@ -119,10 +114,10 @@ test_prepareLocalsNoSectionErrorData = [
] ]
## Test cases where a key error is expected. ## Test cases where a key error is expected.
@pytest.mark.parametrize("parser_data, config_section, defaults", test_prepareLocalsNoSectionErrorData) @pytest.mark.parametrize("parser_data, defaults", test_prepareLocalsNoSectionErrorData)
def test_prepareLocalsNoSectionError(legacy_profile_reader, parser_data, config_section, defaults): def test_prepareLocalsNoSectionError(legacy_profile_reader, parser_data, defaults):
parser = configparser.ConfigParser() parser = configparser.ConfigParser()
parser.read_dict(parser_data) parser.read_dict(parser_data)
with pytest.raises(configparser.NoSectionError): with pytest.raises(configparser.NoSectionError):
legacy_profile_reader.prepareLocals(parser, config_section, defaults) legacy_profile_reader.prepareLocals(parser, "profile", defaults)