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

gix tornado merge conflict

Browse Source
This commit is contained in:
Thomas S Hatch 2014-11-26 09:25:47 -07:00
parent 6aa5b0f858
commit d416b8b1b8
1 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/integration/netapi/rest_tornado/test_app.py
View File

@ -1,24 +1,3 @@
<<<<<<< HEAD
# coding: utf-8
import json
import time
from salttesting.helpers import ensure_in_syspath
ensure_in_syspath('../../../')
try:
from salt.netapi.rest_tornado import saltnado
import tornado.testing
import tornado.concurrent
import tornado.web
import tornado.ioloop
except ImportError:
pass
from unit.netapi.rest_tornado.test_handlers import SaltnadoTestCase
=======
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Import Python Libs # Import Python Libs
@ -46,7 +25,6 @@ try:
HAS_ZMQ_IOLOOP = True HAS_ZMQ_IOLOOP = True
except ImportError: except ImportError:
HAS_ZMQ_IOLOOP = False HAS_ZMQ_IOLOOP = False
>>>>>>> 2014.7
@skipIf(HAS_TORNADO is False, 'Tornado must be installed to run these tests') @skipIf(HAS_TORNADO is False, 'Tornado must be installed to run these tests')