merge with upstream
This commit is contained in:
@@ -28,12 +28,12 @@ class FileValidatorTest(unittest.TestCase):
|
||||
with open('test/fixtures/input_single_tilt.csv', 'r',
|
||||
newline='') as file:
|
||||
cad_input = file.read()
|
||||
eq_(self.subject.validate(cad_input, fake_file, FileType.Csv), None)
|
||||
eq_(self.subject.validate(cad_input, FileType.Csv, fake_file), None)
|
||||
|
||||
def test_unknown_files_are_invalid(self):
|
||||
fake_file = MagicMock()
|
||||
type(fake_file).filename = PropertyMock(return_value="Hi")
|
||||
result = self.subject.validate("Hi", fake_file, FileType.Unknown)
|
||||
result = self.subject.validate("Hi", FileType.Unknown, fake_file)
|
||||
self.should_have_error(result,
|
||||
FileValidationMessage.UnknownFileUploaded, None)
|
||||
|
||||
@@ -62,8 +62,7 @@ class FileValidatorTest(unittest.TestCase):
|
||||
fake_file.read.return_value = open(fname, "rb").read()
|
||||
fake_file.filename.return_value = "expected_dual_tilt_pseries_image.png"
|
||||
stream = self.subject.obtain_stream(fake_file)
|
||||
self.should_have_error(self.subject.validate(stream, fake_file,
|
||||
FileType.AuroraDxf),
|
||||
self.should_have_error(self.subject.validate(stream, FileType.AuroraDxf, fake_file),
|
||||
FileValidationMessage.ExpectedDxfFile,
|
||||
None)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user