Switch fixture imports to wildcard in prep for full db test fixes
This commit is contained in:
		
							parent
							
								
									efcb903e48
								
							
						
					
					
						commit
						7debd44b54
					
				
					 23 changed files with 41 additions and 32 deletions
				
			
		|  | @ -5,7 +5,8 @@ from base64 import b64encode | |||
| from auth.basic import validate_basic_auth, ACCESS_TOKEN_USERNAME, OAUTH_TOKEN_USERNAME | ||||
| from auth.validateresult import AuthKind, ValidateResult | ||||
| from data import model | ||||
| from test.fixtures import app, appconfig, database_uri, init_db_path, sqlitedb_file | ||||
| 
 | ||||
| from test.fixtures import * | ||||
| 
 | ||||
| def _token(username, password): | ||||
|   return 'basic ' + b64encode('%s:%s' % (username, password)) | ||||
|  |  | |||
|  | @ -5,7 +5,7 @@ from flask_login import login_user | |||
| from app import LoginWrappedDBUser | ||||
| from data import model | ||||
| from auth.cookie import validate_session_cookie | ||||
| from test.fixtures import app, appconfig, database_uri, init_db_path, sqlitedb_file | ||||
| from test.fixtures import * | ||||
| 
 | ||||
| def test_anonymous_cookie(app): | ||||
|   assert validate_session_cookie().missing | ||||
|  |  | |||
|  | @ -9,7 +9,7 @@ from auth.auth_context import get_authenticated_user | |||
| from auth.decorators import (extract_namespace_repo_from_session, require_session_login, | ||||
|                              process_auth_or_cookie) | ||||
| from data import model | ||||
| from test.fixtures import app, appconfig, database_uri, init_db_path, sqlitedb_file | ||||
| from test.fixtures import * | ||||
| 
 | ||||
| def test_extract_namespace_repo_from_session_missing(app): | ||||
|   def emptyfunc(): | ||||
|  |  | |||
|  | @ -3,7 +3,7 @@ import pytest | |||
| from auth.oauth import validate_bearer_auth, validate_oauth_token | ||||
| from auth.validateresult import AuthKind, ValidateResult | ||||
| from data import model | ||||
| from test.fixtures import app, appconfig, database_uri, init_db_path, sqlitedb_file | ||||
| from test.fixtures import * | ||||
| 
 | ||||
| @pytest.mark.parametrize('header, expected_result', [ | ||||
|   ('', ValidateResult(AuthKind.oauth, missing=True)), | ||||
|  |  | |||
|  | @ -4,7 +4,7 @@ from auth.auth_context import (get_authenticated_user, get_grant_context, get_va | |||
|                                get_validated_oauth_token) | ||||
| from auth.validateresult import AuthKind, ValidateResult | ||||
| from data import model | ||||
| from test.fixtures import app, appconfig, database_uri, init_db_path, sqlitedb_file | ||||
| from test.fixtures import * | ||||
| 
 | ||||
| 
 | ||||
| def get_user(): | ||||
|  |  | |||
		Reference in a new issue