Allow overriding of assets

diff --git a/src/pgwui_common/assets.py b/src/pgwui_common/assets.py
index 248d37fb4c5c7f5422fc6c031a610540526fdfac..39ab1b6531b6e4ecba8830d4a73220131d4cc48b 100644 (file)
--- a/src/pgwui_common/assets.py
+++ b/src/pgwui_common/assets.py
@@ -23,6 +23,9 @@
 '''
 
 import logging
+import pyramid.exceptions
+
+from . import exceptions as ex
 
 # Logging
 log = logging.getLogger(__name__)
@@ -31,8 +34,16 @@ log = logging.getLogger(__name__)
 def override_assets(config, settings):
     pgwui = settings['pgwui']
     if 'override_assets' not in pgwui:
-        return
+        return []
 
+    errors = []
     for asset, replacement in pgwui['override_assets'].items():
-        config.override_asset(asset, replacement)
-        log.debug(f'Overriding asset ({asset}) with ({replacement})')
+        try:
+            config.override_asset(asset, replacement)
+        except (pyramid.exceptions.ConfigurationError,
+                ModuleNotFoundError) as exp:
+            errors.append(ex.BadAssetOverrideError(asset, replacement, exp))
+        else:
+            log.debug(f'Overriding asset ({asset}) with ({replacement})')
+
+    return errors

diff --git a/src/pgwui_common/exceptions.py b/src/pgwui_common/exceptions.py
index cd69831c1a32d0dbc0c0d39f1c6c5a4eb9dabdaf..80152e781243c31ec80c947f2bb1c957f991b47b 100644 (file)
--- a/src/pgwui_common/exceptions.py
+++ b/src/pgwui_common/exceptions.py
@@ -125,6 +125,20 @@ class NotBooleanSettingError(Error):
             .format(key))
 
 
+class BadAssetOverrideError(Error):
+    def __init__(self, asset, new_asset, exp):
+        super().__init__(
+            f'The asset ({asset}) cannot be overridden with ({new_asset}):'
+            f' {exp}')
+
+
+class BadSettingError(Error):
+    def __init__(self, exp):
+        super().__init__(
+            f'Bad settings caused an error: {exp}'
+            '\nHint: Overriding non-existant assets can cause this problem')
+
+
 class BadPathError(Error):
     pass
 

diff --git a/tests/test_assets.py b/tests/test_assets.py
index 9650edfb18d3b6864d34d2c8e6b709a41d82884e..9948319a5a622b4a9f3a2b8432fd84a0954f9561 100644 (file)
--- a/tests/test_assets.py
+++ b/tests/test_assets.py
@@ -22,7 +22,9 @@
 import pytest
 
 import logging
+import pyramid.exceptions
 import pgwui_common.assets as assets
+import pgwui_common.exceptions as common_ex
 
 from pgwui_testing import testing
 
@@ -35,7 +37,7 @@ pytestmark = pytest.mark.unittest
 mock_override_asset = testing.instance_method_mock_fixture('override_asset')
 
 
-# override_asset()
+# override_assets()
 
 @pytest.mark.parametrize(
     ('overrides', 'call_count'), [
@@ -43,9 +45,10 @@ mock_override_asset = testing.instance_method_mock_fixture('override_asset')
         ({'some_asset': 'new_asset'}, 1),
         ({'some_asset': 'new_asset',
           'other_asset': 'other new asset'}, 2)])
-def test_override_asset(
+def test_override_assets_success(
         caplog, pyramid_config, mock_override_asset, overrides, call_count):
-    '''override_asset() is called for each override
+    '''override_asset() is called and a debug message logged
+    for each good override
     '''
     caplog.set_level(logging.DEBUG)
     mocked_override_asset = mock_override_asset(pyramid_config)
@@ -54,7 +57,32 @@ def test_override_asset(
         settings = {'override_assets': overrides}
     else:
         settings = {}
-    assets.override_assets(pyramid_config, {'pgwui': settings})
+    result = assets.override_assets(pyramid_config, {'pgwui': settings})
 
+    assert result == []
     assert mocked_override_asset.call_count == call_count
     assert len(caplog.record_tuples) == call_count
+
+
+@pytest.mark.parametrize(
+    ('exception'), [
+        (pyramid.exceptions.ConfigurationError,),
+        (ModuleNotFoundError,)])
+def test_override_assets_failure(
+        caplog, pyramid_config, mock_override_asset, exception):
+    '''There is no logging when the override_asset call fails,
+    but an error is returned
+    '''
+    caplog.set_level(logging.DEBUG)
+    mocked_override_asset = mock_override_asset(pyramid_config)
+    mocked_override_asset.side_effect = exception
+
+    result = assets.override_assets(pyramid_config,
+                                    {'pgwui':
+                                     {'override_assets':
+                                      {'asset': 'new'}}})
+    assert len(result) == 1
+    assert isinstance(result[0], common_ex.BadAssetOverrideError)
+
+    logs = caplog.record_tuples
+    assert len(logs) == 0

diff --git a/tests/test_exceptions.py b/tests/test_exceptions.py
index 575412cfde241e9f27108fd07e83d39928bf6023..43ad7b853457e870f8906f2aa34957005d37d8af 100644 (file)
--- a/tests/test_exceptions.py
+++ b/tests/test_exceptions.py
@@ -24,6 +24,18 @@ import pytest
 import pgwui_common.exceptions as common_ex
 
 
+# Unit tests
+
+@pytest.mark.unittest
+def test_badsettingerror():
+    '''Takes an argument'''
+    # Thing is, this exception is only used by PGWUI_Server
+    # when exiting the configuration context raises a configuration
+    # execution error.
+    assert isinstance(common_ex.BadSettingError('foo'),
+                      common_ex.Error)
+
+
 # Functional tests
 
 @pytest.mark.integrationtest