Browse Source

from .utils import *

cclauss 6 years ago
parent
commit
704e5b0fa1

+ 2 - 0
.travis.yml

@@ -4,6 +4,8 @@ cache:
   directories:
     - $HOME/.cache/pip
 matrix:
+  allow_failures:
+    - python: "3.7"  # until we can get Python 3 compatibility in place
   # NOTE: comment out fast_finish if we have to reinstate any allow_failures,
   # because of https://github.com/travis-ci/travis-ci/issues/1696 (multiple
   # notifications)

+ 0 - 1
requirements/prod.txt

@@ -16,7 +16,6 @@ flask-socketio==3.0.2
 Flask-SQLAlchemy==2.2
 psycopg2==2.7.1
 SQLAlchemy==1.1.9
-# MySQL-python==1.2.5
 mysqlclient==1.3.13
 marshmallow==2.13.5
 

+ 1 - 1
tests/test_00_base.py

@@ -4,7 +4,7 @@
 from copy import deepcopy
 
 import pytest
-from utils import *
+from .utils import *
 from walle.model.menu import MenuModel
 from walle.model.user import UserModel
 from walle.service.rbac.role import *

+ 2 - 2
tests/test_00_login.py

@@ -4,10 +4,10 @@ import urllib
 
 import pytest
 
-from utils import *
+from .utils import *
 from walle.model.user import UserModel
 from copy import deepcopy
-from test_00_base import user_data_login
+from .test_00_base import user_data_login
 
 #: 4 登录 owner
 @pytest.mark.usefixtures('db')

+ 1 - 1
tests/test_01_api_environment.py

@@ -4,7 +4,7 @@ from flask import json
 import types
 import urllib
 import pytest
-from utils import *
+from .utils import *
 
 
 @pytest.mark.usefixtures('db')

+ 1 - 1
tests/test_02_api_role.py

@@ -4,7 +4,7 @@ from flask import json
 import types
 import urllib
 import pytest
-from utils import *
+from .utils import *
 
 
 @pytest.mark.usefixtures('db')

+ 1 - 1
tests/test_03_api_user.py

@@ -4,7 +4,7 @@ import urllib
 
 import pytest
 from flask import current_app
-from utils import *
+from .utils import *
 
 user_data = {
     'email': u'test01@walle-web.io',

+ 3 - 3
tests/test_04_api_passport.py

@@ -4,9 +4,9 @@ from flask import json
 import types
 import urllib
 import pytest
-from utils import *
-from test_03_api_user import user_data
-from test_00_base import user_data_login
+from .utils import *
+from .test_03_api_user import user_data
+from .test_00_base import user_data_login
 from copy import deepcopy
 
 @pytest.mark.usefixtures('db')

+ 2 - 2
tests/test_05_api_space.py

@@ -2,8 +2,8 @@
 """Test Apis."""
 import pytest
 from flask import current_app
-from utils import *
-from test_00_base import space_base
+from .utils import *
+from .test_00_base import space_base
 from copy import deepcopy
 @pytest.mark.usefixtures('db')
 class TestApiSpace:

+ 1 - 1
tests/test_06_api_server.py

@@ -4,7 +4,7 @@ from flask import json
 import types
 import urllib
 import pytest
-from utils import *
+from .utils import *
 
 
 @pytest.mark.usefixtures('db')

+ 1 - 1
tests/test_07_api_project.py

@@ -4,7 +4,7 @@ import urllib
 import json
 import pytest
 from flask import current_app
-from utils import *
+from .utils import *
 
 
 @pytest.mark.usefixtures('db')

+ 1 - 1
tests/test_08_api_task.py

@@ -4,7 +4,7 @@ from flask import json
 import types
 import urllib
 import pytest
-from utils import *
+from .utils import *
 from walle.model.task import TaskModel
 
 class TestApiTask: