March 2012 - tor-commits - lists.torproject.org

[stem/master] Tidying up DescriptorReader attributes
by atagar＠torproject.org 26 Mar '12

26 Mar '12

commit e5e0c3895c0cc9ce540e37da6eec9d88e14bdeda Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Mar 11 12:50:56 2012 -0700 Tidying up DescriptorReader attributes Bit of refactoring to limit the scope or improve readability of attributes. --- stem/descriptor/reader.py | 32 ++++++++++++++------------------ 1 files changed, 14 insertions(+), 18 deletions(-) diff --git a/stem/descriptor/reader.py b/stem/descriptor/reader.py index cc19ed6..b003dbd 100644 --- a/stem/descriptor/reader.py +++ b/stem/descriptor/reader.py @@ -151,34 +151,29 @@ class DescriptorReader(threading.Thread): """ Iterator for the descriptor data on the local file system. This can process text files, tarball archives (gzip or bzip2), or recurse directories. + + Arguments: + targets (list) - paths for files or directories to be read from + follow_links (bool) - determines if we'll follow symlinks when transversing + directories """ def __init__(self, targets, follow_links = False): threading.Thread.__init__(self, name="Descriptor Reader") self.setDaemon(True) - # flag to indicate if we'll follow symlinks when transversing directories - self._follow_links = follow_links - self._targets = targets + self._follow_links = follow_links self._skip_listeners = [] self._processed_files = {} self._iter_lock = threading.RLock() self._iter_notice = threading.Event() self._is_reading = threading.Event() - - # files or directories that remain to be read - self._remaining_files = list(self._targets) + self._is_stopped = threading.Event() # descriptors that we have read, but not yet provided to the caller self._unreturned_descriptors = Queue.Queue() - - # flag that's set when stop() is called - self._stop_called = threading.Event() - - # flag that's set when we're out of descriptor files to read - self._finished_reading = threading.Event() def get_processed_files(self): """ @@ -229,24 +224,25 @@ class DescriptorReader(threading.Thread): Stops further reading of descriptor files. """ - self._stop_called.set() + self._is_stopped.set() self._iter_notice.set() def run(self): self._is_reading.set() + remaining_files = list(self._targets) - while self._remaining_files and not self._stop_called.isSet(): - target = self._remaining_files.pop(0) + while remaining_files and not self._is_stopped.isSet(): + target = remaining_files.pop(0) if not os.path.exists(target): continue if os.path.isdir(target): # adds all of the files that it contains for root, _, files in os.walk(target, followlinks = self._follow_links): for filename in files: - self._remaining_files.append(os.path.join(root, filename)) + remaining_files.append(os.path.join(root, filename)) # this can take a while if, say, we're including the root directory - if self._stop_called.isSet(): break + if self._is_stopped.isSet(): break else: # This is a file. Register it's last modified timestamp and check if # it's a file that we should skip. @@ -285,7 +281,7 @@ class DescriptorReader(threading.Thread): def __iter__(self): with self._iter_lock: - while not self._stop_called.isSet(): + while not self._is_stopped.isSet(): try: yield self._unreturned_descriptors.get_nowait() except Queue.Empty:

1 0

[stem/master] Integ test for the set_processed_files() method
by atagar＠torproject.org 26 Mar '12

26 Mar '12

commit ee5fa60dfb96b4ae0bc8f5a18aa244b4b5f296c8 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Mar 11 13:58:00 2012 -0700 Integ test for the set_processed_files() method Testing that the DescriptorReader's set_processed_files() method properly causes us to skip priorly read files. --- test/integ/descriptor/reader.py | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/test/integ/descriptor/reader.py b/test/integ/descriptor/reader.py index 2568262..e8a6c20 100644 --- a/test/integ/descriptor/reader.py +++ b/test/integ/descriptor/reader.py @@ -3,6 +3,7 @@ Integration tests for stem.descriptor.reader. """ import os +import sys import time import signal import unittest @@ -187,4 +188,27 @@ class TestDescriptorReader(unittest.TestCase): pass self.assertEquals(expected_results, reader.get_processed_files()) + + def test_set_processed_files(self): + """ + Checks that calling set_processed_files() prior to reading makes us skip + those files. + """ + + # path and file contents that we want the DescriptorReader to skip + skip_file = os.path.join(DESCRIPTOR_TEST_DATA, "example_descriptor") + + with open(skip_file) as descriptor_file: + skip_contents = descriptor_file.read() + + initial_processed_files = {skip_file: sys.maxint} + + reader = stem.descriptor.reader.DescriptorReader([DESCRIPTOR_TEST_DATA]) + reader.set_processed_files(initial_processed_files) + self.assertEquals(initial_processed_files, reader.get_processed_files()) + + with reader: + for descriptor in reader: + if str(descriptor) == skip_contents: + self.fail() # we read the file that we were trying to skip

1 0

[stem/master] Fixing sinister concurrency issue
by atagar＠torproject.org 26 Mar '12

26 Mar '12

commit 664552e72719776f17cd654928dbf5d0a12e48d9 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Mar 11 13:41:48 2012 -0700 Fixing sinister concurrency issue Replacing the _is_reading event flag with a 'FINISHED' entry in the _unreturned_descriptors queue. This is because python's queues stupidly have no notion of flushing, so there's no method for me to make a reliable check of 'if the reading thread is finished AND the queue is empty'. I may have called 'put'. I may have a proveably not-empty queue. But can I make that check work? Nooooo. That is... frustrating. >:( --- stem/descriptor/reader.py | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/stem/descriptor/reader.py b/stem/descriptor/reader.py index a8f3284..9be6e8f 100644 --- a/stem/descriptor/reader.py +++ b/stem/descriptor/reader.py @@ -81,6 +81,9 @@ import Queue MAX_STORED_DESCRIPTORS = 20 +# flag to indicate when the reader thread is out of descriptor files to read +FINISHED = "DONE" + def load_processed_files(path): """ Loads a dictionary of 'path => last modified timestamp' mappings, as @@ -169,10 +172,11 @@ class DescriptorReader(threading.Thread): self._iter_lock = threading.RLock() self._iter_notice = threading.Event() - self._is_reading = threading.Event() self._is_stopped = threading.Event() - # descriptors that we have read, but not yet provided to the caller + # Descriptors that we have read but not yet provided to the caller. A + # FINISHED entry is used by the reading thread to indicate the end. + self._unreturned_descriptors = Queue.Queue() def get_processed_files(self): @@ -229,10 +233,9 @@ class DescriptorReader(threading.Thread): self._iter_notice.set() def run(self): - self._is_reading.set() remaining_files = list(self._targets) - while remaining_files and not self._is_stopped.isSet(): + while remaining_files and not self._is_stopped.is_set(): target = remaining_files.pop(0) if not os.path.exists(target): continue @@ -243,7 +246,7 @@ class DescriptorReader(threading.Thread): remaining_files.append(os.path.join(root, filename)) # this can take a while if, say, we're including the root directory - if self._is_stopped.isSet(): break + if self._is_stopped.is_set(): break else: # This is a file. Register it's last modified timestamp and check if # it's a file that we should skip. @@ -277,18 +280,18 @@ class DescriptorReader(threading.Thread): elif target_type[1] == 'bzip2': pass # TODO: implement - self._is_reading.clear() + self._unreturned_descriptors.put(FINISHED) self._iter_notice.set() def __iter__(self): with self._iter_lock: - while not self._is_stopped.isSet(): + while not self._is_stopped.is_set(): try: - yield self._unreturned_descriptors.get_nowait() - except Queue.Empty: - # if we've finished and there aren't any descriptors then we're done - if not self._is_reading.isSet() and self._unreturned_descriptors.empty(): break + descriptor = self._unreturned_descriptors.get_nowait() + if descriptor == FINISHED: break + else: yield descriptor + except Queue.Empty: self._iter_notice.wait() self._iter_notice.clear()

1 0

[stem/master] Implementing skip listeners and exception hierarchy
by atagar＠torproject.org 26 Mar '12

26 Mar '12

commit 3bf5098545db24eb178e6b6670463616f284ec96 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Mar 11 14:39:01 2012 -0700 Implementing skip listeners and exception hierarchy Notifying the skip listeners of files that we skip, and adding an exception hierchy for the reasons why. Also a little minor refactoring to move the file handlers out of the run() method. --- stem/descriptor/reader.py | 74 +++++++++++++++++++++++++++++++++++---------- 1 files changed, 58 insertions(+), 16 deletions(-) diff --git a/stem/descriptor/reader.py b/stem/descriptor/reader.py index 9be6e8f..8a1be75 100644 --- a/stem/descriptor/reader.py +++ b/stem/descriptor/reader.py @@ -58,6 +58,12 @@ DescriptorReader - Iterator for descriptor data on the local file system. |- join - joins on the thread used to process descriptor data |- __enter__ / __exit__ - manages the descriptor reader thread in the context +- __iter__ - iterates over descriptor data in unread files + +FileSkipped - Base exception for a file that was skipped. + |- ParsingFailure - Contents can't be parsed as descriptor data. + |- UnrecognizedType - File extension indicates non-descriptor data. + +- ReadFailed - Wraps an error that was raised while reading the file. + +- FileMissing - File does not exist. """ import os @@ -70,7 +76,6 @@ import Queue # - maximum read-ahead # TODO: Remianing impementation items... -# - integ test that we skip the 'processed files' items # - impelment skip listening and add a test for it # - remove start and join methods from header? # - implement gzip and bz2 reading @@ -84,6 +89,30 @@ MAX_STORED_DESCRIPTORS = 20 # flag to indicate when the reader thread is out of descriptor files to read FINISHED = "DONE" +class FileSkipped(Exception): + "Base error when we can't provide descriptor data from a file." + +class ParsingFailure(FileSkipped): + "File contents could not be parsed as descriptor data." + + def __init__(self, parsing_exception): + self.exception = parsing_exception + +class UnrecognizedType(FileSkipped): + "File's mime type indicates that it isn't descriptor data." + + def __init__(self, mime_type): + self.mime_type = mime_type + +class ReadFailed(FileSkipped): + "An IOError occured while trying to read the file." + + def __init__(self, read_exception): + self.exception = exception + +class FileMissing(ReadFailed): + "File does not exist." + def load_processed_files(path): """ Loads a dictionary of 'path => last modified timestamp' mappings, as @@ -237,7 +266,10 @@ class DescriptorReader(threading.Thread): while remaining_files and not self._is_stopped.is_set(): target = remaining_files.pop(0) - if not os.path.exists(target): continue + + if not os.path.exists(target): + self._notify_skip_listeners(target, FileMissing()) + continue if os.path.isdir(target): # adds all of the files that it contains @@ -266,19 +298,14 @@ class DescriptorReader(threading.Thread): target_type = mimetypes.guess_type(target) if target_type[0] in (None, 'text/plain'): - # if either a '.txt' or unknown type then try to process it as a - # descriptor file - - with open(target) as target_file: - # TODO: replace with actual descriptor parsing when we have it - # TODO: impement skip listening - self._unreturned_descriptors.put(target_file.read()) - self._iter_notice.set() - elif target_type[0] == 'application/x-tar': - if target_type[1] == 'gzip': - pass # TODO: implement - elif target_type[1] == 'bzip2': - pass # TODO: implement + # either '.txt' or an unknown type + self._handle_descriptor_file(target) + elif target_type == ('application/x-tar', 'gzip'): + self._handle_archive_gzip(target) + elif target_type == ('application/x-tar', 'bzip2'): + self._handle_archive_gzip(target) + else: + self._notify_skip_listeners(target, UnrecognizedType(target_type)) self._unreturned_descriptors.put(FINISHED) self._iter_notice.set() @@ -295,7 +322,22 @@ class DescriptorReader(threading.Thread): self._iter_notice.wait() self._iter_notice.clear() - def _notify_skip_listener(self, path, exception): + def _handle_descriptor_file(self, target): + try: + # TODO: replace with actual descriptor parsing when we have it + target_file = open(target) + self._unreturned_descriptors.put(target_file.read()) + self._iter_notice.set() + except IOError, exc: + self._notify_skip_listeners(target, ReadFailed(exc)) + + def _handle_archive_gzip(self, target): + pass # TODO: implement + + def _handle_archive_bzip(self, target): + pass # TODO: implement + + def _notify_skip_listeners(self, path, exception): for listener in self.skip_listeners: listener(path, exception)

1 0

[stem/master] Integ test for get_processed_files()
by atagar＠torproject.org 26 Mar '12

26 Mar '12

commit 1bfadbca0ae379b62c140193883a833519c4a887 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Mar 11 13:07:12 2012 -0700 Integ test for get_processed_files() Integration test for the get_processed_files() method of the DescriptorReader class. This and the test_basic_example tests are intermittendly failing right now which indicates a concurrency issue - though this test itself has passed and should be fine. --- test/integ/descriptor/reader.py | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/test/integ/descriptor/reader.py b/test/integ/descriptor/reader.py index 5fa61b8..24786b7 100644 --- a/test/integ/descriptor/reader.py +++ b/test/integ/descriptor/reader.py @@ -162,4 +162,26 @@ class TestDescriptorReader(unittest.TestCase): reader.stop() reader.join() is_test_running = False + + def test_get_processed_files(self): + """ + Checks that get_processed_files() provides the expected results after + iterating over our test data. + """ + + expected_results = {} + + for root, _, files in os.walk(DESCRIPTOR_TEST_DATA): + for filename in files: + path = os.path.join(root, filename) + last_modified = os.stat(path).st_mtime + expected_results[path] = last_modified + + reader = stem.descriptor.reader.DescriptorReader([DESCRIPTOR_TEST_DATA]) + + with reader: + for descriptor in reader: + pass + + self.assertEquals(expected_results, reader.get_processed_files())

1 0

[stem/master] Running test_basic_example() multiple times
by atagar＠torproject.org 26 Mar '12

26 Mar '12

commit 2f8a3c838fd63a83a6087313b5a3f52160d2e4fb Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Mar 11 13:17:09 2012 -0700 Running test_basic_example() multiple times Rerunning the test_basic_example() test fifteen times to make it more sensetive to concurrency issues. It now fails consistently! (... yay?) --- stem/descriptor/reader.py | 2 +- test/integ/descriptor/reader.py | 31 +++++++++++++++++-------------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/stem/descriptor/reader.py b/stem/descriptor/reader.py index 018adc7..a8f3284 100644 --- a/stem/descriptor/reader.py +++ b/stem/descriptor/reader.py @@ -287,7 +287,7 @@ class DescriptorReader(threading.Thread): yield self._unreturned_descriptors.get_nowait() except Queue.Empty: # if we've finished and there aren't any descriptors then we're done - if not self._is_reading.isSet(): break + if not self._is_reading.isSet() and self._unreturned_descriptors.empty(): break self._iter_notice.wait() self._iter_notice.clear() diff --git a/test/integ/descriptor/reader.py b/test/integ/descriptor/reader.py index 24786b7..2568262 100644 --- a/test/integ/descriptor/reader.py +++ b/test/integ/descriptor/reader.py @@ -122,20 +122,23 @@ class TestDescriptorReader(unittest.TestCase): with open(descriptor_path) as descriptor_file: descriptor_entries.append(descriptor_file.read()) - reader = stem.descriptor.reader.DescriptorReader([DESCRIPTOR_TEST_DATA]) - - with reader: - for descriptor in reader: - descriptor_str = str(descriptor) - - if descriptor_str in descriptor_entries: - descriptor_entries.remove(descriptor_str) - else: - # iterator is providing output that we didn't expect - self.fail() - - # check that we've seen all of the descriptor_entries - self.assertTrue(len(descriptor_entries) == 0) + # running this test multiple times to flush out concurrency issues + for i in xrange(15): + reader = stem.descriptor.reader.DescriptorReader([DESCRIPTOR_TEST_DATA]) + remaining_entries = list(descriptor_entries) + + with reader: + for descriptor in reader: + descriptor_str = str(descriptor) + + if descriptor_str in remaining_entries: + remaining_entries.remove(descriptor_str) + else: + # iterator is providing output that we didn't expect + self.fail() + + # check that we've seen all of the descriptor_entries + self.assertTrue(len(remaining_entries) == 0) def test_stop(self): """

1 0

[stem/master] Integ test for files skipped due to permissions
by atagar＠torproject.org 26 Mar '12

26 Mar '12

commit 77ac27cbe057e9411c28d0a8be814046465d335b Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Mar 11 15:20:50 2012 -0700 Integ test for files skipped due to permissions Adding an integration test that listens for a file which is skipped because the user lacks read permissions. --- test/integ/descriptor/reader.py | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/test/integ/descriptor/reader.py b/test/integ/descriptor/reader.py index 7e5955d..fa2c7b5 100644 --- a/test/integ/descriptor/reader.py +++ b/test/integ/descriptor/reader.py @@ -250,6 +250,36 @@ class TestDescriptorReader(unittest.TestCase): if os.path.exists(test_path): os.remove(test_path) + def test_skip_listener_read_failure(self): + """ + Listens for a file that's skipped because we lack read permissions. + """ + + test_path = os.path.join(test.runner.get_runner().get_test_dir(), "secret_file") + + with open(test_path, "w") as test_file: + test_file.write("test data for test_skip_listener_unrecognized_type()") + + os.chmod(test_path, 0077) # remove read permissions + + skip_listener = SkipListener() + reader = stem.descriptor.reader.DescriptorReader([test_path]) + reader.register_skip_listener(skip_listener.listener) + + with reader: + for descriptor in reader: + pass + + self.assertTrue(len(skip_listener.results) == 1) + + skipped_path, skip_exception = skip_listener.results[0] + self.assertEqual(test_path, skipped_path) + self.assertTrue(isinstance(skip_exception, stem.descriptor.reader.ReadFailed)) + self.assertTrue(isinstance(skip_exception.exception, IOError)) + + if os.path.exists(test_path): + os.remove(test_path) + def test_skip_listener_file_missing(self): """ Listens for a file that's skipped because the file doesn't exist.

1 0

[stem/master] Integ test for skipping files that don't exist
by atagar＠torproject.org 26 Mar '12

26 Mar '12

commit 827d3495084f762d4e2e0df3253fea00fc532707 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Mar 11 15:13:57 2012 -0700 Integ test for skipping files that don't exist Adding an integration test that listens for a file which is skipped because it doesn't exist. --- stem/descriptor/reader.py | 5 ++++- test/integ/descriptor/reader.py | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletions(-) diff --git a/stem/descriptor/reader.py b/stem/descriptor/reader.py index 0dde2a9..9ef6781 100644 --- a/stem/descriptor/reader.py +++ b/stem/descriptor/reader.py @@ -108,10 +108,13 @@ class ReadFailed(FileSkipped): "An IOError occured while trying to read the file." def __init__(self, read_exception): - self.exception = exception + self.exception = read_exception class FileMissing(ReadFailed): "File does not exist." + + def __init__(self): + ReadFailed.__init__(self, None) def load_processed_files(path): """ diff --git a/test/integ/descriptor/reader.py b/test/integ/descriptor/reader.py index 4ef1d58..7e5955d 100644 --- a/test/integ/descriptor/reader.py +++ b/test/integ/descriptor/reader.py @@ -249,4 +249,25 @@ class TestDescriptorReader(unittest.TestCase): if os.path.exists(test_path): os.remove(test_path) + + def test_skip_listener_file_missing(self): + """ + Listens for a file that's skipped because the file doesn't exist. + """ + + test_path = "/foo/bar/doesn't_exist" + + skip_listener = SkipListener() + reader = stem.descriptor.reader.DescriptorReader([test_path]) + reader.register_skip_listener(skip_listener.listener) + + with reader: + for descriptor in reader: + pass + + self.assertTrue(len(skip_listener.results) == 1) + + skipped_path, skip_exception = skip_listener.results[0] + self.assertEqual(test_path, skipped_path) + self.assertTrue(isinstance(skip_exception, stem.descriptor.reader.FileMissing))

1 0

[stem/master] Integ test for skipping a file due to its mime type
by atagar＠torproject.org 26 Mar '12

26 Mar '12

commit 9f8683f182b1199ba1eb6955130e46db0bae5372 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Mar 11 15:05:54 2012 -0700 Integ test for skipping a file due to its mime type Adding an integration test that listens for a file which is skipped due to a type indicating that it doesn't contain descriptor data. --- stem/descriptor/reader.py | 2 +- test/integ/descriptor/reader.py | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletions(-) diff --git a/stem/descriptor/reader.py b/stem/descriptor/reader.py index 8a1be75..0dde2a9 100644 --- a/stem/descriptor/reader.py +++ b/stem/descriptor/reader.py @@ -338,7 +338,7 @@ class DescriptorReader(threading.Thread): pass # TODO: implement def _notify_skip_listeners(self, path, exception): - for listener in self.skip_listeners: + for listener in self._skip_listeners: listener(path, exception) def __enter__(self): diff --git a/test/integ/descriptor/reader.py b/test/integ/descriptor/reader.py index e8a6c20..4ef1d58 100644 --- a/test/integ/descriptor/reader.py +++ b/test/integ/descriptor/reader.py @@ -37,6 +37,13 @@ def _make_processed_files_listing(contents): return test_listing_path +class SkipListener: + def __init__(self): + self.results = [] # (path, exception) tuples that we've received + + def listener(self, path, exception): + self.results.append((path, exception)) + class TestDescriptorReader(unittest.TestCase): def tearDown(self): # cleans up 'processed file' listings that we made @@ -211,4 +218,35 @@ class TestDescriptorReader(unittest.TestCase): for descriptor in reader: if str(descriptor) == skip_contents: self.fail() # we read the file that we were trying to skip + + def test_skip_listener_unrecognized_type(self): + """ + Listens for a file that's skipped because its file type isn't recognized. + """ + + # types are solely based on file extensions so making something that looks + # like an png image + + test_path = os.path.join(test.runner.get_runner().get_test_dir(), "test.png") + + with open(test_path, "w") as test_file: + test_file.write("test data for test_skip_listener_unrecognized_type()") + + skip_listener = SkipListener() + reader = stem.descriptor.reader.DescriptorReader([test_path]) + reader.register_skip_listener(skip_listener.listener) + + with reader: + for descriptor in reader: + pass + + self.assertTrue(len(skip_listener.results) == 1) + + skipped_path, skip_exception = skip_listener.results[0] + self.assertEqual(test_path, skipped_path) + self.assertTrue(isinstance(skip_exception, stem.descriptor.reader.UnrecognizedType)) + self.assertEqual(("image/png", None), skip_exception.mime_type) + + if os.path.exists(test_path): + os.remove(test_path)

1 0

[stem/master] Being more careful to remove temporary test files
by atagar＠torproject.org 26 Mar '12

26 Mar '12

commit 16feb65cb0b8141137a14ab0cdde79ed79ed6f5a Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Mar 12 08:18:57 2012 -0700 Being more careful to remove temporary test files When tests failed they could leave behind temporary files which, in the case of the 'secret_file' (which lacked read permissions) this would trip up future test runs. --- test/integ/descriptor/reader.py | 70 ++++++++++++++++++++------------------- 1 files changed, 36 insertions(+), 34 deletions(-) diff --git a/test/integ/descriptor/reader.py b/test/integ/descriptor/reader.py index fa2c7b5..a6190ef 100644 --- a/test/integ/descriptor/reader.py +++ b/test/integ/descriptor/reader.py @@ -232,23 +232,24 @@ class TestDescriptorReader(unittest.TestCase): with open(test_path, "w") as test_file: test_file.write("test data for test_skip_listener_unrecognized_type()") - skip_listener = SkipListener() - reader = stem.descriptor.reader.DescriptorReader([test_path]) - reader.register_skip_listener(skip_listener.listener) - - with reader: - for descriptor in reader: - pass - - self.assertTrue(len(skip_listener.results) == 1) - - skipped_path, skip_exception = skip_listener.results[0] - self.assertEqual(test_path, skipped_path) - self.assertTrue(isinstance(skip_exception, stem.descriptor.reader.UnrecognizedType)) - self.assertEqual(("image/png", None), skip_exception.mime_type) - - if os.path.exists(test_path): - os.remove(test_path) + try: + skip_listener = SkipListener() + reader = stem.descriptor.reader.DescriptorReader([test_path]) + reader.register_skip_listener(skip_listener.listener) + + with reader: + for descriptor in reader: + pass + + self.assertTrue(len(skip_listener.results) == 1) + + skipped_path, skip_exception = skip_listener.results[0] + self.assertEqual(test_path, skipped_path) + self.assertTrue(isinstance(skip_exception, stem.descriptor.reader.UnrecognizedType)) + self.assertEqual(("image/png", None), skip_exception.mime_type) + finally: + if os.path.exists(test_path): + os.remove(test_path) def test_skip_listener_read_failure(self): """ @@ -262,23 +263,24 @@ class TestDescriptorReader(unittest.TestCase): os.chmod(test_path, 0077) # remove read permissions - skip_listener = SkipListener() - reader = stem.descriptor.reader.DescriptorReader([test_path]) - reader.register_skip_listener(skip_listener.listener) - - with reader: - for descriptor in reader: - pass - - self.assertTrue(len(skip_listener.results) == 1) - - skipped_path, skip_exception = skip_listener.results[0] - self.assertEqual(test_path, skipped_path) - self.assertTrue(isinstance(skip_exception, stem.descriptor.reader.ReadFailed)) - self.assertTrue(isinstance(skip_exception.exception, IOError)) - - if os.path.exists(test_path): - os.remove(test_path) + try: + skip_listener = SkipListener() + reader = stem.descriptor.reader.DescriptorReader([test_path]) + reader.register_skip_listener(skip_listener.listener) + + with reader: + for descriptor in reader: + pass + + self.assertTrue(len(skip_listener.results) == 1) + + skipped_path, skip_exception = skip_listener.results[0] + self.assertEqual(test_path, skipped_path) + self.assertTrue(isinstance(skip_exception, stem.descriptor.reader.ReadFailed)) + self.assertTrue(isinstance(skip_exception.exception, IOError)) + finally: + if os.path.exists(test_path): + os.remove(test_path) def test_skip_listener_file_missing(self): """

1 0