Skip to content

Commit d14d28f

Browse files
committed
added test cases
1 parent 71c77f3 commit d14d28f

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

app/core/models.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,8 @@ def clean(self):
303303

304304
if self.schema_file:
305305
# scan file for malicious payloads
306-
cd = clamd.ClamdNetworkSocket(host="clamd.clamav", port=3310, timeout=10)
306+
cd = clamd.ClamdNetworkSocket(host="clamd.clamav", port=3310,
307+
timeout=10)
307308
json_file = self.schema_file
308309
scan_results = cd.instream(json_file)['stream']
309310
if 'OK' not in scan_results:
@@ -400,13 +401,15 @@ def clean(self):
400401
if self.schema_mapping_file:
401402
json_file = self.schema_mapping_file
402403
# scan file for malicious payloads
403-
cd = clamd.ClamdNetworkSocket(host="clamd.clamav", port=3310, timeout=10)
404+
cd = clamd.ClamdNetworkSocket(host="clamd.clamav",
405+
port=3310, timeout=10)
404406
scan_results = cd.instream(json_file)['stream']
405407
if 'OK' not in scan_results:
406408
for issue_type, issue in [scan_results, ]:
407409
logger.error(
408410
'%s %s in transform %s to %s',
409-
issue_type, issue, self.source_schema.iri, self.target_schema.iri # noqa: E501
411+
issue_type, issue, self.source_schema.iri,
412+
self.target_schema.iri # noqa: E501
410413
)
411414
# only load json if no issues found
412415
else:

app/core/tests/test_models_unit.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ def test_schema_ledger_virus(self):
7171
patch('core.models.clamd') as clam:
7272
clam.instream.return_value = {'stream': ('BAD', 'EICAR')}
7373
clam.ClamdUnixSocket.return_value = clam
74+
clam.ClamdNetworkSocket.return_value = clam
7475

7576
self.assertEqual(schema.version, '')
7677
self.assertEqual(schema.schema_file.size, len(EICAR))
@@ -112,6 +113,7 @@ def test_schema_ledger_non_json(self):
112113
magic.from_file.return_value = 'text/plain'
113114
clam.instream.return_value = {'stream': ('OK', 'OKAY')}
114115
clam.ClamdUnixSocket.return_value = clam
116+
clam.ClamdNetworkSocket.return_value = clam
115117

116118
self.assertEqual(schema.version, '')
117119
self.assertEqual(schema.schema_file.size, len(file_contents))
@@ -153,6 +155,7 @@ def test_schema_ledger_bleach(self):
153155
magic.from_file.return_value = 'application/json'
154156
clam.instream.return_value = {'stream': ('OK', 'OKAY')}
155157
clam.ClamdUnixSocket.return_value = clam
158+
clam.ClamdNetworkSocket.return_value = clam
156159

157160
self.assertEqual(schema.version, '')
158161
self.assertEqual(schema.schema_file.size, len(file_contents))
@@ -207,6 +210,7 @@ def test_transformation_ledger_virus(self):
207210
patch('core.models.clamd') as clam:
208211
clam.instream.return_value = {'stream': ('BAD', 'EICAR')}
209212
clam.ClamdUnixSocket.return_value = clam
213+
clam.ClamdNetworkSocket.return_value = clam
210214

211215
self.assertEqual(mapping.schema_mapping_file.size, len(EICAR))
212216
mapping.clean()
@@ -242,6 +246,7 @@ def test_transformation_ledger_non_json(self):
242246
magic.from_file.return_value = 'text/plain'
243247
clam.instream.return_value = {'stream': ('OK', 'OKAY')}
244248
clam.ClamdUnixSocket.return_value = clam
249+
clam.ClamdNetworkSocket.return_value = clam
245250

246251
self.assertEqual(mapping.schema_mapping_file.size,
247252
len(file_contents))
@@ -279,6 +284,7 @@ def test_transformation_ledger_bleach(self):
279284
magic.from_file.return_value = 'application/json'
280285
clam.instream.return_value = {'stream': ('OK', 'OKAY')}
281286
clam.ClamdUnixSocket.return_value = clam
287+
clam.ClamdNetworkSocket.return_value = clam
282288

283289
self.assertEqual(mapping.schema_mapping_file.size,
284290
len(file_contents))

0 commit comments

Comments
 (0)