mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Skip test if locale does not exist
This commit is contained in:
parent
dd3a6a53ad
commit
e443061612
1 changed files with 14 additions and 8 deletions
|
@ -5,12 +5,6 @@ from tests.support.helpers import destructiveTest, requires_salt_modules, slowTe
|
|||
from tests.support.unit import skipIf
|
||||
|
||||
|
||||
def _find_new_locale(current_locale):
|
||||
for locale in ["en_US.UTF-8", "de_DE.UTF-8", "fr_FR.UTF-8"]:
|
||||
if locale != current_locale:
|
||||
return locale
|
||||
|
||||
|
||||
@skipIf(salt.utils.platform.is_windows(), "minion is windows")
|
||||
@skipIf(salt.utils.platform.is_darwin(), "locale method is not supported on mac")
|
||||
@skipIf(
|
||||
|
@ -20,6 +14,18 @@ def _find_new_locale(current_locale):
|
|||
@requires_salt_modules("locale")
|
||||
@pytest.mark.windows_whitelisted
|
||||
class LocaleModuleTest(ModuleCase):
|
||||
def _find_new_locale(self, current_locale):
|
||||
test_locales = ["en_US.UTF-8", "de_DE.UTF-8", "fr_FR.UTF-8", "en_AU.UTF-8"]
|
||||
for locale in test_locales:
|
||||
if locale != current_locale and self.run_function("locale.avail", [locale]):
|
||||
return locale
|
||||
|
||||
self.skipTest(
|
||||
"The test locals: {} do not exist on the host. Skipping test.".format(
|
||||
",".join(test_locales)
|
||||
)
|
||||
)
|
||||
|
||||
def test_get_locale(self):
|
||||
locale = self.run_function("locale.get_locale")
|
||||
self.assertNotIn("Unsupported platform!", locale)
|
||||
|
@ -40,7 +46,7 @@ class LocaleModuleTest(ModuleCase):
|
|||
)
|
||||
|
||||
locale = self.run_function("locale.get_locale")
|
||||
new_locale = _find_new_locale(locale)
|
||||
new_locale = self._find_new_locale(locale)
|
||||
ret = self.run_function("locale.gen_locale", [new_locale])
|
||||
self.assertTrue(ret)
|
||||
|
||||
|
@ -48,7 +54,7 @@ class LocaleModuleTest(ModuleCase):
|
|||
@slowTest
|
||||
def test_set_locale(self):
|
||||
original_locale = self.run_function("locale.get_locale")
|
||||
locale_to_set = _find_new_locale(original_locale)
|
||||
locale_to_set = self._find_new_locale(original_locale)
|
||||
self.run_function("locale.gen_locale", [locale_to_set])
|
||||
ret = self.run_function("locale.set_locale", [locale_to_set])
|
||||
new_locale = self.run_function("locale.get_locale")
|
||||
|
|
Loading…
Add table
Reference in a new issue