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

Merge pull request #40162 from rallytime/archive-integration-test-fixes

Browse Source 
Make sure the tornado web server is stopped at the end of the test class
This commit is contained in:
Mike Place 2017-03-20 14:35:20 -06:00 committed by GitHub
commit aec504173a
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/integration/states/archive.py
View File

@ -10,6 +10,7 @@ import os
import platform
import socket
import threading
import tornado.httpserver
import tornado.ioloop
import tornado.web
@ -35,7 +36,6 @@ 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')
REDHAT7 = False
QUERY_OS = platform.dist()
@ -59,7 +59,8 @@ class ArchiveTest(integration.ModuleCase,
'''
application = tornado.web.Application([(r"/(.*)", tornado.web.StaticFileHandler,
{"path": STATE_DIR})])
application.listen(PORT)
cls.server = tornado.httpserver.HTTPServer(application)
cls.server.listen(PORT)
tornado.ioloop.IOLoop.instance().start()
@classmethod
@ -83,6 +84,7 @@ class ArchiveTest(integration.ModuleCase,
def tearDownClass(cls):
tornado.ioloop.IOLoop.instance().stop()
cls.server_thread.join()
cls.server.stop()
def setUp(self):
self._clear_archive_dir()

8
tests/integration/states/file.py
View File

@ -19,6 +19,7 @@ import stat
import tempfile
import textwrap
import threading
import tornado.httpserver
import tornado.ioloop
import tornado.web
import filecmp
@ -2403,7 +2404,6 @@ class FileTest(integration.ModuleCase, integration.SaltReturnAssertsMixIn):
PORT = 9999
FILE_SOURCE = 'http://localhost:{0}/grail/scene33'.format(PORT)
FILE_HASH = 'd2feb3beb323c79fc7a0f44f1408b4a3'
STATE_DIR = os.path.join(integration.FILES, 'file', 'base')
class RemoteFileTest(integration.ModuleCase, integration.SaltReturnAssertsMixIn):
@ -2419,7 +2419,8 @@ class RemoteFileTest(integration.ModuleCase, integration.SaltReturnAssertsMixIn)
application = tornado.web.Application([
(r'/(.*)', tornado.web.StaticFileHandler, {'path': STATE_DIR})
])
application.listen(PORT)
cls.server = tornado.httpserver.HTTPServer(application)
cls.server.listen(PORT)
tornado.ioloop.IOLoop.instance().start()
@classmethod
@ -2442,6 +2443,7 @@ class RemoteFileTest(integration.ModuleCase, integration.SaltReturnAssertsMixIn)
def tearDownClass(cls):
tornado.ioloop.IOLoop.instance().stop()
cls.server_thread.join()
cls.server.stop()
def setUp(self):
fd_, self.name = tempfile.mkstemp(dir=integration.TMP)
@ -2499,4 +2501,4 @@ class RemoteFileTest(integration.ModuleCase, integration.SaltReturnAssertsMixIn)
if __name__ == '__main__':
from integration import run_tests
run_tests(FileTest)
run_tests(FileTest, RemoteFileTest)