Tests: style.

This commit is contained in:
Andrey Zelenkov
2018-01-10 20:35:22 +03:00
parent 8546d6d499
commit 470948a0d6
4 changed files with 11 additions and 22 deletions

View File

@@ -1,13 +1,10 @@
import unit
import unittest
import unit
class TestUnitConfiguration(unit.TestUnitControl):
def setUpClass():
u = unit.TestUnit()
module_missed = u.check_modules('python')
if module_missed:
raise unittest.SkipTest('Unit has no ' + module_missed + ' module')
unit.TestUnit().check_modules('python')
def test_json_applications(self):
self.assertIn('error', self.put('/applications', '"{}"'),

View File

@@ -1,13 +1,10 @@
import unit
import unittest
import unit
class TestUnitBasic(unit.TestUnitControl):
def setUpClass():
u = unit.TestUnit()
module_missed = u.check_modules('php')
if module_missed:
raise unittest.SkipTest('Unit has no ' + module_missed + ' module')
unit.TestUnit().check_modules('php')
def test_php_get(self):
resp = self.get()

View File

@@ -1,13 +1,10 @@
import unit
import unittest
import unit
class TestUnitBasic(unit.TestUnitControl):
def setUpClass():
u = unit.TestUnit()
module_missed = u.check_modules('python')
if module_missed:
raise unittest.SkipTest('Unit has no ' + module_missed + ' module')
unit.TestUnit().check_modules('python')
def test_python_get(self):
resp = self.get()

View File

@@ -41,16 +41,18 @@ class TestUnit(unittest.TestCase):
if m is None:
exit("Unit is writing log too long")
ret = ''
missed_module = ''
for module in modules:
m = re.search('module: ' + module, log, re.M | re.S)
if m is None:
ret = module
missed_module = module
break
self._stop()
shutil.rmtree(self.testdir)
return ret
if missed_module:
raise unittest.SkipTest('Unit has no ' + missed_module + ' module')
def _run(self):
self.testdir = tempfile.mkdtemp(prefix='unit-test-')
@@ -131,7 +133,6 @@ class TestUnitControl(TestUnit):
# TODO http client
def http(self, req):
with self._control_sock() as sock:
sock.sendall(req)
@@ -146,21 +147,18 @@ class TestUnitControl(TestUnit):
return resp
def get(self, path='/'):
resp = self.http(('GET ' + path
+ ' HTTP/1.1\r\nHost: localhost\r\n\r\n').encode())
return self._body_json(resp)
def delete(self, path='/'):
resp = self.http(('DELETE ' + path
+ ' HTTP/1.1\r\nHost: localhost\r\n\r\n').encode())
return self._body_json(resp)
def put(self, path='/', data=''):
if isinstance(data, str):
data = data.encode()