From 3df2129d536d4978f20544b1af143c2548151fa7 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Wed, 18 Sep 2019 17:01:02 -0700 Subject: [PATCH] Porting PR #52568 to 2019.2.1 --- tests/integration/__init__.py | 5 +++-- tests/integration/doc/test_man.py | 1 + tests/integration/ssh/test_grains.py | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py index 415531028822..12aa840b2144 100644 --- a/tests/integration/__init__.py +++ b/tests/integration/__init__.py @@ -104,15 +104,16 @@ def get_unused_localhost_port(): DARWIN = True if sys.platform.startswith('darwin') else False BSD = True if 'bsd' in sys.platform else False + AIX = True if sys.platform.startswith('aix') else False - if DARWIN and port in _RUNTESTS_PORTS: + if (AIX or DARWIN) and port in _RUNTESTS_PORTS: port = get_unused_localhost_port() usock.close() return port _RUNTESTS_PORTS[port] = usock - if DARWIN or BSD: + if DARWIN or BSD or AIX: usock.close() return port diff --git a/tests/integration/doc/test_man.py b/tests/integration/doc/test_man.py index 15ee43124d9a..4e71c4ca03e1 100644 --- a/tests/integration/doc/test_man.py +++ b/tests/integration/doc/test_man.py @@ -18,6 +18,7 @@ @skipIf(salt.utils.platform.is_windows(), 'minion is windows') +@skipIf(salt.utils.platform.is_aix(), 'minion is AIX') class ManTest(ModuleCase): # Map filenames to search strings which should be in the manpage manpages = { diff --git a/tests/integration/ssh/test_grains.py b/tests/integration/ssh/test_grains.py index 841537b4c5c2..ddfb1a2196b1 100644 --- a/tests/integration/ssh/test_grains.py +++ b/tests/integration/ssh/test_grains.py @@ -24,5 +24,7 @@ def test_grains_items(self): grain = 'Linux' if salt.utils.platform.is_darwin(): grain = 'Darwin' + if salt.utils.platform.is_aix(): + grain = 'AIX' self.assertEqual(ret['kernel'], grain) self.assertTrue(isinstance(ret, dict))