diff --git a/test/unittests/config_stack/remote.yaml b/test/unittests/config_stack/remote.yaml deleted file mode 100644 index 0db1071..0000000 --- a/test/unittests/config_stack/remote.yaml +++ /dev/null @@ -1,12 +0,0 @@ -config_name: remote -system_only: - from_sys: False - from_rem: True - from_usr: False -test: - remote: True - system: False - user: False -default_spec: - from_rem: True -remote_only: "remote" \ No newline at end of file diff --git a/test/unittests/test_configuration.py b/test/unittests/test_configuration.py index 907fc2e..694d0c2 100644 --- a/test/unittests/test_configuration.py +++ b/test/unittests/test_configuration.py @@ -35,7 +35,7 @@ def tearDownClass(cls) -> None: def tearDown(self): from ovos_config.config import Configuration - Configuration.load_config_stack([{}], True) + Configuration.load_config_stack([{}]) Configuration._callbacks = [] @patch('json.dump') @@ -132,11 +132,9 @@ def test_load_config_stack(self): test_dir = join(dirname(__file__), "config_stack") default_config = LocalConf(join(test_dir, "default.yaml")) system_config = LocalConf(join(test_dir, "system.yaml")) - remote_config = LocalConf(join(test_dir, "remote.yaml")) user_config = LocalConf(join(test_dir, "user.yaml")) Configuration.default = default_config Configuration.system = system_config - Configuration.remote = remote_config Configuration.xdg_configs = [user_config] Configuration.__patch = LocalConf(None) Configuration._old_user = LocalConf(None) @@ -150,18 +148,17 @@ def test_load_config_stack(self): "from_usr": False}) # Test default constraints (overridden) self.assertEqual(config["default_spec"], {"from_sys": True, - "from_rem": True, + "from_rem": False, "from_usr": True}) # Test nested constraints self.assertEqual(config["test"], {"default": True, "system": True, "user": True, - "remote": True}) + "remote": False}) # Test non-overridden default config self.assertEqual(config["default_only"], "default") # Test protected key is undefined self.assertFalse("user_only" in config) - self.assertEqual(config["remote_only"], "remote") def test_config_patches_filewatch(self): event = Event()