diff options
| author | Olivier Tilloy <olivier@tilloy.net> | 2011-10-24 09:30:53 +0200 |
|---|---|---|
| committer | Olivier Tilloy <olivier@tilloy.net> | 2011-10-24 09:30:53 +0200 |
| commit | 5267093545dcc19666ceb925cbe7cedb9be0c449 (patch) | |
| tree | e9d7190d05b426a764a9a8b6f518c4900eaa4251 | |
| parent | dd401698544b81ba345591467e508d5d6d47620e (diff) | |
| download | pyexiv2-5267093545dcc19666ceb925cbe7cedb9be0c449.tar.gz | |
Implement a poor man’s test skipping solution to substitute @unittest.skipIf, which is only available starting with Python 2.7.
| -rw-r--r-- | test/iptc.py | 7 | ||||
| -rw-r--r-- | test/xmp.py | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/test/iptc.py b/test/iptc.py index 872990a..ed1b2f6 100644 --- a/test/iptc.py +++ b/test/iptc.py @@ -182,8 +182,13 @@ class TestIptcTag(unittest.TestCase): # Invalid values self.failUnlessRaises(IptcValueError, tag._convert_to_string, 'invalid') - @unittest.skipIf(pytz is None, 'install python-tz to run this test') def test_convert_to_string_time_with_real_timezones(self): + if pytz is None: + # Poor man’s test skipping. Starting with Python 2.7, decorators are + # available to implement this in a cleaner fashion + # (http://docs.python.org/library/unittest.html#unittest-skipping). + print 'Install python-tz to run this test. Skipping.' + return tag = IptcTag('Iptc.Envelope.TimeSent') self.assertEqual(tag.type, 'Time') t = pytz.timezone('UTC').localize(datetime.datetime(2011, 2, 2, 10, 52, 4)) diff --git a/test/xmp.py b/test/xmp.py index ba5b0b6..70e0980 100644 --- a/test/xmp.py +++ b/test/xmp.py @@ -184,8 +184,13 @@ class TestXmpTag(unittest.TestCase): self.failUnlessRaises(XmpValueError, tag._convert_to_string, 'invalid', 'Date') self.failUnlessRaises(XmpValueError, tag._convert_to_string, None, 'Date') - @unittest.skipIf(pytz is None, 'install python-tz to run this test') def test_convert_to_string_date_with_real_timezones(self): + if pytz is None: + # Poor man’s test skipping. Starting with Python 2.7, decorators are + # available to implement this in a cleaner fashion + # (http://docs.python.org/library/unittest.html#unittest-skipping). + print 'Install python-tz to run this test. Skipping.' + return tag = XmpTag('Xmp.xmp.CreateDate') self.assertEqual(tag.type, 'Date') t = pytz.timezone('UTC').localize(datetime.datetime(2011, 2, 2, 10, 52, 4)) |