Merge pull request #3166 from quay/move-publicrepo-test
Move public repo test to pytest
This commit is contained in:
		
						commit
						1a2513e0ec
					
				
					 2 changed files with 8 additions and 32 deletions
				
			
		|  | @ -1,3 +1,5 @@ | ||||||
|  | from datetime import timedelta | ||||||
|  | 
 | ||||||
| import pytest | import pytest | ||||||
| 
 | 
 | ||||||
| from peewee import IntegrityError | from peewee import IntegrityError | ||||||
|  | @ -43,3 +45,9 @@ def test_search_pagination(query, authed_username, initialized_db): | ||||||
|   next_repos = get_filtered_matching_repositories(query, filter_username=authed_username, offset=1) |   next_repos = get_filtered_matching_repositories(query, filter_username=authed_username, offset=1) | ||||||
|   assert repositories[0].id != next_repos[0].id |   assert repositories[0].id != next_repos[0].id | ||||||
|   assert repositories[1].id == next_repos[0].id |   assert repositories[1].id == next_repos[0].id | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | def test_popular_repo_list(initialized_db): | ||||||
|  |   onlypublic = model.repository.list_popular_public_repos(0, timedelta(weeks=1)) | ||||||
|  |   assert len(onlypublic) == 1 | ||||||
|  |   assert onlypublic[0] == ('public', 'publicrepo') | ||||||
|  |  | ||||||
|  | @ -1,32 +0,0 @@ | ||||||
| import unittest |  | ||||||
| from datetime import timedelta |  | ||||||
| 
 |  | ||||||
| from app import app |  | ||||||
| from initdb import setup_database_for_testing, finished_database_for_testing |  | ||||||
| from data import model |  | ||||||
| 
 |  | ||||||
| 
 |  | ||||||
| PUBLIC_USERNAME = 'public' |  | ||||||
| PUBLIC_REPONAME = 'publicrepo' |  | ||||||
| 
 |  | ||||||
| 
 |  | ||||||
| class TestRepoModel(unittest.TestCase): |  | ||||||
|   def setUp(self): |  | ||||||
|     setup_database_for_testing(self) |  | ||||||
| 
 |  | ||||||
|     self.app = app.test_client() |  | ||||||
|     self.ctx = app.test_request_context() |  | ||||||
|     self.ctx.__enter__() |  | ||||||
| 
 |  | ||||||
|   def tearDown(self): |  | ||||||
|     finished_database_for_testing(self) |  | ||||||
|     self.ctx.__exit__(True, None, None) |  | ||||||
| 
 |  | ||||||
|   def test_popular_repo_list(self): |  | ||||||
|     onlypublic = model.repository.list_popular_public_repos(0, timedelta(weeks=1)) |  | ||||||
|     self.assertEquals(len(onlypublic), 1) |  | ||||||
|     self.assertEquals(onlypublic[0], (PUBLIC_USERNAME, PUBLIC_REPONAME)) |  | ||||||
| 
 |  | ||||||
| 
 |  | ||||||
| if __name__ == '__main__': |  | ||||||
|   unittest.main() |  | ||||||
		Reference in a new issue