diff --git a/tests/test_backup.py b/tests/test_backup.py index 6deec00e2223f014a87fd417a75478373afa509f..4af6313d9c7d39a6dc45bd0f330d43f8401e9660 100755 --- a/tests/test_backup.py +++ b/tests/test_backup.py @@ -11,7 +11,6 @@ import os import socket import subprocess import sys -import glob GREEN = '\033[92m' RED = '\033[91m' @@ -80,18 +79,14 @@ def test_backup_space(server=None, path="/backup"): def check_backup_is_incremental(path): + # incremental backups done with tmbackup mean that they will all at least contain links dirs = os.listdir(path) - dirs.sort() - for d in dirs: - num_folders = 0 + files_count = 0 folder_path = os.path.join(path, d) if os.path.isdir(folder_path): - media = glob.glob(os.path.join(path, d, "*/msinstance/media/resources/")) - for m in media: - num_folders += len(os.listdir(m)) - print('%s: %s' % (d, num_folders)) - if num_folders == 0: + files_count = len(os.listdir(folder_path)) + if files_count == 0: print('Folder %s is empty, this indicates non-incremental backups (we are expecting links)' % folder_path) os.rmdir(folder_path) print('Folder removed')