Tests: options moved to the separate class.
This change is necessary to separate the logic and prevent possible circular dependency.
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
import os
|
||||
import subprocess
|
||||
|
||||
from conftest import option
|
||||
from unit.applications.proto import TestApplicationProto
|
||||
from unit.option import option
|
||||
|
||||
|
||||
class TestApplicationGo(TestApplicationProto):
|
||||
|
||||
@@ -4,8 +4,8 @@ import shutil
|
||||
import subprocess
|
||||
|
||||
import pytest
|
||||
from conftest import option
|
||||
from unit.applications.proto import TestApplicationProto
|
||||
from unit.option import option
|
||||
|
||||
|
||||
class TestApplicationJava(TestApplicationProto):
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import shutil
|
||||
from urllib.parse import quote
|
||||
|
||||
from conftest import option
|
||||
from conftest import public_dir
|
||||
from unit.applications.proto import TestApplicationProto
|
||||
from unit.option import option
|
||||
|
||||
|
||||
class TestApplicationNode(TestApplicationProto):
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
from conftest import option
|
||||
from unit.applications.proto import TestApplicationProto
|
||||
from unit.option import option
|
||||
|
||||
|
||||
class TestApplicationPerl(TestApplicationProto):
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
from conftest import option
|
||||
import os
|
||||
import shutil
|
||||
|
||||
from unit.applications.proto import TestApplicationProto
|
||||
from unit.option import option
|
||||
|
||||
|
||||
class TestApplicationPHP(TestApplicationProto):
|
||||
|
||||
@@ -3,8 +3,8 @@ import shutil
|
||||
from urllib.parse import quote
|
||||
|
||||
import pytest
|
||||
from conftest import option
|
||||
from unit.applications.proto import TestApplicationProto
|
||||
from unit.option import option
|
||||
|
||||
|
||||
class TestApplicationPython(TestApplicationProto):
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
from conftest import option
|
||||
from unit.applications.proto import TestApplicationProto
|
||||
from unit.option import option
|
||||
|
||||
|
||||
class TestApplicationRuby(TestApplicationProto):
|
||||
|
||||
@@ -2,8 +2,8 @@ import os
|
||||
import re
|
||||
import time
|
||||
|
||||
from conftest import option
|
||||
from unit.control import TestControl
|
||||
from unit.option import option
|
||||
|
||||
|
||||
class TestApplicationProto(TestControl):
|
||||
|
||||
@@ -2,8 +2,8 @@ import os
|
||||
import ssl
|
||||
import subprocess
|
||||
|
||||
from conftest import option
|
||||
from unit.applications.proto import TestApplicationProto
|
||||
from unit.option import option
|
||||
|
||||
|
||||
class TestApplicationTLS(TestApplicationProto):
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import json
|
||||
|
||||
from conftest import option
|
||||
from unit.http import TestHTTP
|
||||
from unit.option import option
|
||||
|
||||
|
||||
def args_handler(conf_func):
|
||||
|
||||
@@ -4,7 +4,7 @@ from unit.applications.lang.go import TestApplicationGo
|
||||
from unit.applications.lang.java import TestApplicationJava
|
||||
from unit.applications.lang.node import TestApplicationNode
|
||||
from unit.applications.proto import TestApplicationProto
|
||||
from conftest import option
|
||||
from unit.option import option
|
||||
|
||||
|
||||
class TestFeatureIsolation(TestApplicationProto):
|
||||
|
||||
@@ -7,8 +7,8 @@ import select
|
||||
import socket
|
||||
|
||||
import pytest
|
||||
from conftest import option
|
||||
from unit.main import TestUnit
|
||||
from unit.option import option
|
||||
|
||||
|
||||
class TestHTTP(TestUnit):
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import pytest
|
||||
from conftest import option
|
||||
from unit.option import option
|
||||
|
||||
|
||||
class TestUnit():
|
||||
|
||||
16
test/unit/option.py
Normal file
16
test/unit/option.py
Normal file
@@ -0,0 +1,16 @@
|
||||
class Options():
|
||||
_options = {
|
||||
'skip_alerts': [],
|
||||
'skip_sanitizer': False,
|
||||
}
|
||||
|
||||
def __setattr__(self, name, value):
|
||||
Options._options[name] = value
|
||||
|
||||
def __getattr__(self, name):
|
||||
if name in Options._options:
|
||||
return Options._options[name]
|
||||
|
||||
raise AttributeError
|
||||
|
||||
option = Options()
|
||||
Reference in New Issue
Block a user