test_grabber: define try..except block in test more narrowly

Bare except: is never nice. Also, let's put the try..except block around
only the urlgrab() call.

1 files changed, 22 insertions, 19 deletions

diff --git a/test/test_grabber.py b/test/test_grabber.py
index e5fdfab..360f933 100644
--- a/test/test_grabber.py
+++ b/test/test_grabber.py
@@ -504,34 +504,38 @@ class HTTPRegetTests(FTPRegetTests):
         self.url = short_ref_http
 
     def test_older_check_timestamp(self):
+        # define this here rather than in the FTP tests because currently,
+        # we get no timestamp information back from ftp servers.
+        self._make_half_zero_file()
+        ts = 1600000000 # set local timestamp to 2020
+        os.utime(self.filename, (ts, ts))
+
         try:
-            # define this here rather than in the FTP tests because currently,
-            # we get no timestamp information back from ftp servers.
-            self._make_half_zero_file()
-            ts = 1600000000 # set local timestamp to 2020
-            os.utime(self.filename, (ts, ts))
             self.grabber.urlgrab(self.url, self.filename, reget='check_timestamp')
-            data = self._read_file()
-
-            self.assertEquals(data[:self.hl], b'0'*self.hl)
-            self.assertEquals(data[self.hl:], self.ref[self.hl:])
         except NotImplementedError:
             self.skip()
 
+        data = self._read_file()
+
+        self.assertEquals(data[:self.hl], b'0'*self.hl)
+        self.assertEquals(data[self.hl:], self.ref[self.hl:])
+
     def test_newer_check_timestamp(self):
+        # define this here rather than in the FTP tests because currently,
+        # we get no timestamp information back from ftp servers.
+        self._make_half_zero_file()
+        ts = 1 # set local timestamp to 1969
+        os.utime(self.filename, (ts, ts))
+
         try:
-            # define this here rather than in the FTP tests because currently,
-            # we get no timestamp information back from ftp servers.
-            self._make_half_zero_file()
-            ts = 1 # set local timestamp to 1969
-            os.utime(self.filename, (ts, ts))
             self.grabber.urlgrab(self.url, self.filename, reget='check_timestamp')
-            data = self._read_file()
-
-            self.assertEquals(data, self.ref)
-        except:
+        except NotImplementedError:
             self.skip()
 
+        data = self._read_file()
+
+        self.assertEquals(data, self.ref)
+
 class FileRegetTests(HTTPRegetTests):
     def setUp(self):
         self.ref = short_reference_data
@@ -619,4 +623,3 @@ if __name__ == '__main__':
     grabber.DEBUG = 0
     runner = TextTestRunner(stream=sys.stdout,descriptions=1,verbosity=2)
     runner.run(suite())
-