mirror of https://github.com/pallets/flask.git
				
				
				
			Fixed flask tests
This commit is contained in:
		
							parent
							
								
									e059bf311c
								
							
						
					
					
						commit
						d2d8e66130
					
				|  | @ -37,13 +37,18 @@ def connect_db(): | |||
|     return rv | ||||
| 
 | ||||
| 
 | ||||
| @app.cli.command() | ||||
| def initdb(): | ||||
|     """Creates the database tables.""" | ||||
| def init_db(): | ||||
|     """Initializes the database.""" | ||||
|     db = get_db() | ||||
|     with app.open_resource('schema.sql', mode='r') as f: | ||||
|         db.cursor().executescript(f.read()) | ||||
|     db.commit() | ||||
| 
 | ||||
| 
 | ||||
| @app.cli.command('initdb') | ||||
| def initdb_command(): | ||||
|     """Creates the database tables.""" | ||||
|     init_db() | ||||
|     print('Initialized the database.') | ||||
| 
 | ||||
| 
 | ||||
|  |  | |||
|  | @ -21,6 +21,7 @@ class FlaskrTestCase(unittest.TestCase): | |||
|         self.db_fd, flaskr.app.config['DATABASE'] = tempfile.mkstemp() | ||||
|         flaskr.app.config['TESTING'] = True | ||||
|         self.app = flaskr.app.test_client() | ||||
|         with flaskr.app.app_context(): | ||||
|             flaskr.init_db() | ||||
| 
 | ||||
|     def tearDown(self): | ||||
|  |  | |||
|  | @ -49,15 +49,21 @@ def close_database(exception): | |||
|         top.sqlite_db.close() | ||||
| 
 | ||||
| 
 | ||||
| @app.cli.command() | ||||
| def initdb(): | ||||
|     """Creates the database tables.""" | ||||
| def init_db(): | ||||
|     """Initializes the database.""" | ||||
|     db = get_db() | ||||
|     with app.open_resource('schema.sql', mode='r') as f: | ||||
|         db.cursor().executescript(f.read()) | ||||
|     db.commit() | ||||
| 
 | ||||
| 
 | ||||
| @app.cli.command('initdb') | ||||
| def initdb_command(): | ||||
|     """Creates the database tables.""" | ||||
|     init_db() | ||||
|     print('Initialized the database.') | ||||
| 
 | ||||
| 
 | ||||
| def query_db(query, args=(), one=False): | ||||
|     """Queries the database and returns a list of dictionaries.""" | ||||
|     cur = get_db().execute(query, args) | ||||
|  |  | |||
|  | @ -20,6 +20,7 @@ class MiniTwitTestCase(unittest.TestCase): | |||
|         """Before each test, set up a blank database""" | ||||
|         self.db_fd, minitwit.app.config['DATABASE'] = tempfile.mkstemp() | ||||
|         self.app = minitwit.app.test_client() | ||||
|         with minitwit.app.app_context(): | ||||
|             minitwit.init_db() | ||||
| 
 | ||||
|     def tearDown(self): | ||||
|  |  | |||
|  | @ -199,9 +199,9 @@ class FlaskGroup(click.Group): | |||
|                     value = prepare_exec_for_file(value) | ||||
|                 elif '.' not in sys.path: | ||||
|                     sys.path.insert(0, '.') | ||||
|             ctx.obj.app_import_path = value | ||||
|             ctx.ensure_object(ScriptInfo).app_import_path = value | ||||
|         def set_debug(ctx, value): | ||||
|             ctx.obj.debug = value | ||||
|             ctx.ensure_object(ScriptInfo).debug = value | ||||
| 
 | ||||
|         click.Group.__init__(self, help=help, params=[ | ||||
|             click.Option(['-a', '--app'], | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue