diff --git a/armi/settings/tests/test_settings.py b/armi/settings/tests/test_settings.py index 6c9d28255..9e4db5085 100644 --- a/armi/settings/tests/test_settings.py +++ b/armi/settings/tests/test_settings.py @@ -41,7 +41,7 @@ THIS_DIR = os.path.dirname(__file__) -class DummyParamPlugin1(plugins.ArmiPlugin): +class DummySettingPlugin1(plugins.ArmiPlugin): @staticmethod @plugins.HOOKIMPL def defineSettings(): @@ -58,7 +58,7 @@ def defineSettings(): ] -class DummyParamPlugin2(plugins.ArmiPlugin): +class DummySettingPlugin2(plugins.ArmiPlugin): @staticmethod @plugins.HOOKIMPL def defineSettings(): @@ -241,7 +241,7 @@ def test_pluginSettings(self): :tests: R_ARMI_PLUGIN_SETTINGS """ pm = getPluginManagerOrFail() - pm.register(DummyParamPlugin1) + pm.register(DummySettingPlugin1) # We have a setting; this should be fine cs = caseSettings.Settings() @@ -252,20 +252,20 @@ def test_pluginSettings(self): newSettings = {"extendableOption": "PLUGIN"} cs = cs.modified(newSettings=newSettings) - pm.register(DummyParamPlugin2) + pm.register(DummySettingPlugin2) cs = caseSettings.Settings() self.assertEqual(cs["extendableOption"], "PLUGIN") # Now we should have the option from plugin 2; make sure that works cs = cs.modified(newSettings=newSettings) cs["extendableOption"] = "PLUGIN" self.assertIn("extendableOption", cs.keys()) - pm.unregister(DummyParamPlugin2) - pm.unregister(DummyParamPlugin1) + pm.unregister(DummySettingPlugin2) + pm.unregister(DummySettingPlugin1) # Now try the same, but adding the plugins in a different order. This is to make # sure that it doesnt matter if the Setting or its Options come first - pm.register(DummyParamPlugin2) - pm.register(DummyParamPlugin1) + pm.register(DummySettingPlugin2) + pm.register(DummySettingPlugin1) cs = caseSettings.Settings() self.assertEqual(cs["extendableOption"], "PLUGIN")