Enable testing on MacOS

Attempt to reproduce local failure of 4 tests which reproduces with
multiple python versions, likely OSX specific.
pull/303/head
Sorin Sbarnea 5 years ago
parent 8da98f2122
commit 9856706880

@ -8,6 +8,20 @@ python:
- 3.7
- 3.8
- nightly
jobs:
include:
- python: 2.7
os: osx
env: REMOVE_LOCALES=false
- python: 2.7
os: osx
env: REMOVE_LOCALES=true
- python: 3.8
os: osx
env: REMOVE_LOCALES=false
- python: 3.8
os: osx
env: REMOVE_LOCALES=true
env:
- REMOVE_LOCALES=false
- REMOVE_LOCALES=true

@ -116,9 +116,9 @@ class KeyOrderingTestCase(RuleTestCase):
def test_locale_case(self):
self.addCleanup(locale.setlocale, locale.LC_ALL, (None, None))
try:
locale.setlocale(locale.LC_ALL, 'en_US.UTF-8')
locale.setlocale(locale.LC_ALL, 'C.UTF-8')
except locale.Error:
self.skipTest('locale en_US.UTF-8 not available')
self.skipTest('locale C.UTF-8 not available')
conf = ('key-ordering: enable')
self.check('---\n'
't-shirt: 1\n'
@ -135,9 +135,9 @@ class KeyOrderingTestCase(RuleTestCase):
def test_locale_accents(self):
self.addCleanup(locale.setlocale, locale.LC_ALL, (None, None))
try:
locale.setlocale(locale.LC_ALL, 'en_US.UTF-8')
locale.setlocale(locale.LC_ALL, 'C.UTF-8')
except locale.Error:
self.skipTest('locale en_US.UTF-8 not available')
self.skipTest('locale C.UTF-8 not available')
conf = ('key-ordering: enable')
self.check('---\n'
'hair: true\n'

@ -308,13 +308,14 @@ class CommandLineTestCase(unittest.TestCase):
self.addCleanup(os.environ.update, HOME=os.environ['HOME'])
os.environ['HOME'] = home
os.environ.pop('XDG_CONFIG_HOME', None)
with open(config, 'w') as f:
f.write('rules: {trailing-spaces: disable}')
with RunContext(self) as ctx:
cli.run((os.path.join(self.wd, 'a.yaml'), ))
self.assertEqual(ctx.returncode, 0)
self.assertEqual(ctx.returncode, 0, msg="%s" % config)
with open(config, 'w') as f:
f.write('rules: {trailing-spaces: enable}')
@ -347,9 +348,9 @@ class CommandLineTestCase(unittest.TestCase):
# reset to default before running the test,
# as the first two runs don't use setlocale()
try:
locale.setlocale(locale.LC_ALL, 'en_US.UTF-8')
locale.setlocale(locale.LC_ALL, 'C.UTF-8')
except locale.Error:
self.skipTest('locale en_US.UTF-8 not available')
self.skipTest('locale C.UTF-8 not available')
locale.setlocale(locale.LC_ALL, (None, None))
# C + en.yaml should fail

Loading…
Cancel
Save