rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed TestCaptureMethods

Browse source
This commit is contained in:
Joel Collins 2019-01-08 13:23:36 +00:00
parent af76442149
commit 3c34b43e32
2 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
openflexure_microscope/camera/capture.py
View file

@ -40,14 +40,16 @@ class StreamObject(object):
# Create file name. Default to UUID # Create file name. Default to UUID
if not filename: if not filename:
filename = self.id filename = self.id
self.build_file_path(filename, folder, self.format) self.filename = filename
self.folder = folder
self.build_file_path(self.filename, self.folder, self.format)
# Byte stream properties # Byte stream properties
self.stream = io.BytesIO() # Byte stream that data will be written to self.stream = io.BytesIO() # Byte stream that data will be written to
# Set default write target # Set default write target
self.write_to_file = write_to_file self.write_to_file = write_to_file
if self.write_to_file is False: if not self.write_to_file:
logging.debug("Target for {} set to 'stream'".format(self.id)) logging.debug("Target for {} set to 'stream'".format(self.id))
self.target = self.stream self.target = self.stream
else: else:
@ -69,6 +71,11 @@ class StreamObject(object):
Stored files will be cleaned up automatically.".format(self.id)) Stored files will be cleaned up automatically.".format(self.id))
self.keep_on_disk = False # Flag file to be removed on close. self.keep_on_disk = False # Flag file to be removed on close.
self.context_manager = True # Used in metadata self.context_manager = True # Used in metadata
# Re-generate file name for temp file
logging.info("Re-generating file name for temp file")
self.build_file_path(self.filename, self.folder, self.format)
return self return self
def __exit__(self, *args): def __exit__(self, *args):

10
tests/test_camera.py
View file

@ -89,9 +89,9 @@ class TestCaptureMethods(unittest.TestCase):
dims = resize dims = resize
else: else:
if use_video_port: if use_video_port:
dims = camera.settings['video_resolution'] dims = camera.config['video_resolution']
else: else:
dims = camera.settings['image_resolution'] dims = camera.config['image_resolution']
# Ensure PIL image size matches expected size # Ensure PIL image size matches expected size
print(image.size, dims) print(image.size, dims)
@ -287,9 +287,9 @@ if __name__ == '__main__':
suites = [ suites = [
unittest.TestLoader().loadTestsFromTestCase(TestCaptureMethods), unittest.TestLoader().loadTestsFromTestCase(TestCaptureMethods),
unittest.TestLoader().loadTestsFromTestCase(TestUnencodedMethods), #unittest.TestLoader().loadTestsFromTestCase(TestUnencodedMethods),
unittest.TestLoader().loadTestsFromTestCase(TestThreadStarting), #unittest.TestLoader().loadTestsFromTestCase(TestThreadStarting),
unittest.TestLoader().loadTestsFromTestCase(TestRecordMethods), #unittest.TestLoader().loadTestsFromTestCase(TestRecordMethods),
] ]
alltests = unittest.TestSuite(suites) alltests = unittest.TestSuite(suites)