valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't hardcode the webserver port number

Browse Source
This commit is contained in:
Pedro Algarvio 2017-03-11 16:00:28 +00:00
parent af242e1c51
commit 992a8c7294
No known key found for this signature in database
GPG Key ID: BB36BF6584A298FF
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tests/integration/states/test_archive.py
View File

@ -15,6 +15,7 @@ import tornado.web
# Import Salt Testing libs
import tests.integration as integration
from tests.support.unit import skipIf
from tests.support.helpers import get_unused_localhost_port
# Import salt libs
import salt.utils
@ -27,8 +28,6 @@ if salt.utils.is_windows():
else:
ARCHIVE_DIR = '/tmp/archive'
PORT = 9999
ARCHIVE_TAR_SOURCE = 'http://localhost:{0}/custom.tar.gz'.format(PORT)
UNTAR_FILE = os.path.join(ARCHIVE_DIR, 'custom/README')
ARCHIVE_TAR_HASH = 'md5=7643861ac07c30fe7d2310e9f25ca514'
STATE_DIR = os.path.join(integration.FILES, 'file', 'base')
@ -49,7 +48,7 @@ class ArchiveTest(integration.ModuleCase,
cls._ioloop.make_current()
cls._application = tornado.web.Application([(r'/(.*)', tornado.web.StaticFileHandler,
{'path': STATE_DIR})])
cls._application.listen(PORT)
cls._application.listen(cls.server_port)
cls._ioloop.start()
@classmethod
@ -61,11 +60,13 @@ class ArchiveTest(integration.ModuleCase,
cls.server_thread = threading.Thread(target=cls.webserver)
cls.server_thread.daemon = True
cls.server_thread.start()
cls.server_port = get_unused_localhost_port()
cls.archive_tar_source = 'http://localhost:{0}/custom.tar.gz'.format(cls.server_port)
# check if tornado app is up
port_closed = True
while port_closed:
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
result = sock.connect_ex(('127.0.0.1', PORT))
result = sock.connect_ex(('127.0.0.1', cls.server_port))
if result == 0:
port_closed = False
@ -105,7 +106,7 @@ class ArchiveTest(integration.ModuleCase,
test archive.extracted with skip_verify
'''
ret = self.run_state('archive.extracted', name=ARCHIVE_DIR,
source=ARCHIVE_TAR_SOURCE, archive_format='tar',
source=self.archive_tar_source, archive_format='tar',
skip_verify=True)
log.debug('ret = %s', ret)
if 'Timeout' in ret:
@ -121,7 +122,7 @@ class ArchiveTest(integration.ModuleCase,
ensure source_hash is verified correctly
'''
ret = self.run_state('archive.extracted', name=ARCHIVE_DIR,
source=ARCHIVE_TAR_SOURCE, archive_format='tar',
source=self.archive_tar_source, archive_format='tar',
source_hash=ARCHIVE_TAR_HASH)
log.debug('ret = %s', ret)
if 'Timeout' in ret:
@ -137,7 +138,7 @@ class ArchiveTest(integration.ModuleCase,
test archive.extracted with user and group set to "root"
'''
ret = self.run_state('archive.extracted', name=ARCHIVE_DIR,
source=ARCHIVE_TAR_SOURCE, archive_format='tar',
source=self.archive_tar_source, archive_format='tar',
source_hash=ARCHIVE_TAR_HASH,
user='root', group='root')
log.debug('ret = %s', ret)
@ -153,7 +154,7 @@ class ArchiveTest(integration.ModuleCase,
test archive.extracted with --strip in options
'''
ret = self.run_state('archive.extracted', name=ARCHIVE_DIR,
source=ARCHIVE_TAR_SOURCE,
source=self.archive_tar_source,
source_hash=ARCHIVE_TAR_HASH,
options='--strip=1',
enforce_toplevel=False)
@ -170,7 +171,7 @@ class ArchiveTest(integration.ModuleCase,
test archive.extracted with --strip-components in options
'''
ret = self.run_state('archive.extracted', name=ARCHIVE_DIR,
source=ARCHIVE_TAR_SOURCE,
source=self.archive_tar_source,
source_hash=ARCHIVE_TAR_HASH,
options='--strip-components=1',
enforce_toplevel=False)
@ -187,7 +188,7 @@ class ArchiveTest(integration.ModuleCase,
test archive.extracted with no archive_format option
'''
ret = self.run_state('archive.extracted', name=ARCHIVE_DIR,
source=ARCHIVE_TAR_SOURCE,
source=self.archive_tar_source,
source_hash=ARCHIVE_TAR_HASH)
log.debug('ret = %s', ret)
if 'Timeout' in ret:

12
tests/support/helpers.py
View File

@ -32,6 +32,18 @@ if six.PY2:
import __builtin__ as pybuiltins # pylint: disable=incompatible-py3-code,import-error
else:
import builtins as pybuiltins # pylint: disable=import-error
try:
from pytestsalt.utils import get_unused_localhost_port
except ImportError:
def get_unused_localhost_port():
'''
Return a random unused port on localhost
'''
usock = socket.socket(family=socket.AF_INET, type=socket.SOCK_STREAM)
usock.bind(('127.0.0.1', 0))
port = usock.getsockname()[1]
usock.close()
return port
# Import Salt Tests Support libs
from tests.support.unit import skip, _id