paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 06:23:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

test_fixtures: Remove hardcoding of check_files status dir.

Browse Source 
This is preparatory support for using this framework in provision as
well.
This commit is contained in:
Tim Abbott
2017-06-02 12:45:24 -07:00
parent 4da9383f2d
commit 6d00da2b80
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
zerver/lib/test_fixtures.py
View File

@@ -14,7 +14,6 @@ from django.core.management import call_command
from django.utils.module_loading import module_has_submodule from django.utils.module_loading import module_has_submodule
FILENAME_SPLITTER = re.compile('[\W\-_]') FILENAME_SPLITTER = re.compile('[\W\-_]')
TEST_DB_STATUS_DIR = 'var/test_db_status'
def database_exists(database_name, **options): def database_exists(database_name, **options):
# type: (Text, **Any) -> bool # type: (Text, **Any) -> bool
@@ -66,19 +65,19 @@ def are_migrations_the_same(migration_file, **options):
migration_content = f.read() migration_content = f.read()
return migration_content == get_migration_status(**options) return migration_content == get_migration_status(**options)
def _get_hash_file_path(source_file_path): def _get_hash_file_path(source_file_path, status_dir):
# type: (str) -> str # type: (str, str) -> str
basename = os.path.basename(source_file_path) basename = os.path.basename(source_file_path)
filename = '_'.join(FILENAME_SPLITTER.split(basename)).lower() filename = '_'.join(FILENAME_SPLITTER.split(basename)).lower()
return os.path.join(TEST_DB_STATUS_DIR, filename) return os.path.join(status_dir, filename)
def _check_hash(target_hash_file, **options): def _check_hash(target_hash_file, status_dir):
# type: (str, **Any) -> bool # type: (str, str) -> bool
""" """
This function has a side effect of creating a new hash file or This function has a side effect of creating a new hash file or
updating the old hash file. updating the old hash file.
""" """
source_hash_file = _get_hash_file_path(target_hash_file) source_hash_file = _get_hash_file_path(target_hash_file, status_dir)
with open(target_hash_file) as f: with open(target_hash_file) as f:
target_hash_content = hashlib.sha1(f.read().encode('utf8')).hexdigest() target_hash_content = hashlib.sha1(f.read().encode('utf8')).hexdigest()
@@ -98,8 +97,9 @@ def is_template_database_current(
database_name='zulip_test_template', database_name='zulip_test_template',
migration_status='var/migration-status', migration_status='var/migration-status',
settings='zproject.test_settings', settings='zproject.test_settings',
status_dir='var/test_db_status',
check_files=None): check_files=None):
# type: (Text, Text, Text, Optional[List[str]]) -> bool # type: (str, str, str, str, Optional[List[str]]) -> bool
# Using str type for check_files because re.split doesn't accept unicode # Using str type for check_files because re.split doesn't accept unicode
if check_files is None: if check_files is None:
check_files = [ check_files = [
@@ -108,14 +108,14 @@ def is_template_database_current(
'tools/setup/postgres-init-dev-db', 'tools/setup/postgres-init-dev-db',
] ]
if not os.path.exists(TEST_DB_STATUS_DIR): if not os.path.exists(status_dir):
os.mkdir(TEST_DB_STATUS_DIR) os.mkdir(status_dir)
if database_exists(database_name): if database_exists(database_name):
# To ensure Python evaluates all the hash tests (and thus creates the # To ensure Python evaluates all the hash tests (and thus creates the
# hash files about the current state), we evaluate them in a # hash files about the current state), we evaluate them in a
# list and then process the result # list and then process the result
hash_status = all([_check_hash(fn) for fn in check_files]) hash_status = all([_check_hash(fn, status_dir) for fn in check_files])
return are_migrations_the_same(migration_status, settings=settings) and hash_status return are_migrations_the_same(migration_status, settings=settings) and hash_status
return False return False