Revert "wip: Fix pytest_plugin domain factory"

This reverts commit df41208.

Author: pedro-psb

pulpcore/pytest_plugin.py

@@ -632,22 +632,16 @@ def _settings_factory(storage_class=None, storage_settings=None):
 
         def get_installation_storage_option(key, backend):
             value = pulp_settings.STORAGES["default"].get("OPTIONS", {}).get(key)
-            if value:
-                return value
             # Some FileSystem backend options may be defined in the top settings module
-            if backend != "pulpcore.app.models.storage.FileSystem":
-                return None
-            value = getattr(pulp_settings, key, None)
+            if backend == "pulpcore.app.models.storage.FileSystem" and not value:
+                value = getattr(pulp_settings, key, None)
             return value
 
         storage_settings = storage_settings or dict()
         storage_backend = storage_class or pulp_settings.STORAGES["default"]["BACKEND"]
         unset_storage_settings = (k for k in keys[storage_backend] if k not in storage_settings)
         for key in unset_storage_settings:
-            value = get_installation_storage_option(key, storage_backend)
-            if not value:
-                continue
-            storage_settings[key] = value
+            storage_settings[key] = get_installation_storage_option(key, storage_backend)
         return storage_backend, storage_settings
 
     return _settings_factory