diff options
| author | Daniel G. Taylor <dan@programmer-art.org> | 2014-08-25 10:10:24 -0700 |
|---|---|---|
| committer | Daniel G. Taylor <dan@programmer-art.org> | 2014-08-25 10:10:24 -0700 |
| commit | 2b87583140206185e35ee3918a263081235db785 (patch) | |
| tree | 5dfa77fa0a08e0735e532e6dff847678f7be195d | |
| parent | 383795119e2638fa19e45d50cfad343ab937dfcc (diff) | |
| parent | 1be1ce0300b2d5af3afa293c40956e852ac92794 (diff) | |
| download | boto-2b87583140206185e35ee3918a263081235db785.tar.gz | |
Merge pull request #2554 from kz9676/skip-unsupported-locale-unittest
Skip test when locale is missing. Fixes #2554, #2540.
| -rw-r--r-- | tests/unit/utils/test_utils.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/unit/utils/test_utils.py b/tests/unit/utils/test_utils.py index 57a04a66..c170506a 100644 --- a/tests/unit/utils/test_utils.py +++ b/tests/unit/utils/test_utils.py @@ -279,7 +279,10 @@ class TestStringToDatetimeParsing(unittest.TestCase): """ Test string to datetime parsing """ def setUp(self): self._saved = locale.setlocale(locale.LC_ALL) - locale.setlocale(locale.LC_ALL, 'de_DE.UTF-8') + try: + locale.setlocale(locale.LC_ALL, 'de_DE.UTF-8') + except locale.Error: + self.skipTest('Unsupported locale setting') def tearDown(self): locale.setlocale(locale.LC_ALL, self._saved) |