Skip to content

Commit cf01698

Browse files
TomBaxterfelliott
authored andcommitted
Updated to comply with docker-compose support for environment settings
Updated test to look for more specific error [OSF-6670]
1 parent 8a0d7d5 commit cf01698

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed
Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
try:
2-
from mfr import settings
3-
except ImportError:
4-
settings = {}
5-
6-
config = settings.get('CODEPYGMENTS_EXTENSION_CONFIG', {})
1+
from mfr import settings
72

3+
config = settings.child('CODEPYGMENTS_EXTENSION_CONFIG')
84

95
MAX_SIZE = config.get('MAX_SIZE', 65536)

tests/extensions/codepygments/test_renderer.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
from mfr.core.provider import ProviderMetadata
77

88
from mfr.extensions.codepygments import CodePygmentsRenderer
9+
from mfr.extensions.codepygments.exceptions import FileToLargeException
910
from mfr.extensions.codepygments import settings
1011

1112

@@ -92,7 +93,7 @@ def test_render_codepygments_max_size(self, metadata, max_size_file_path, url, a
9293
os.remove(max_size_file_path)
9394

9495
def test_render_codepygments_over_size(self, metadata, over_size_file_path, url, assets_url, export_url):
95-
with pytest.raises(RendererError):
96+
with pytest.raises(FileToLargeException):
9697
try:
9798
renderer = CodePygmentsRenderer(metadata, over_size_file_path,
9899
url, assets_url, export_url)

0 commit comments

Comments
 (0)