Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Initial support for running tests on AIX #52568

Merged
merged 1 commit into from
Apr 17, 2019
Merged

Initial support for running tests on AIX #52568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions tests/integration/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions tests/integration/doc/test_man.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@


@skipIf(salt.utils.platform.is_windows(), 'minion is windows')
@skipIf(salt.utils.platform.is_aix(), 'minion is AIX')
class ManTest(ModuleCase):
rootdir = os.path.join(TMP, 'mantest')
# Map filenames to search strings which should be in the manpage
Expand Down
2 changes: 2 additions & 0 deletions tests/integration/ssh/test_grains.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))