tests: Incremented pattern_data_counter based on loaded patterns

Author: Somerandomguy10111

opxrd/database/opxrd.py

@@ -1,5 +1,6 @@
 import os.path
 import tempfile
+import time
 import zipfile
 
 import requests
@@ -30,8 +31,11 @@ def as_database_list(cls, root_dirpath : str, download : bool = True) -> list[Pa
         pattern_dbs = []
         for d in os.listdir(path=root_dirpath):
             dirpath = os.path.join(root_dirpath, d)
+            print(f' - Loading database {d}')
+            time.sleep(0.01)
             db = PatternDB.load(dirpath=dirpath, strict=True)
             db.name = d
+
             pattern_dbs.append(db)
         return pattern_dbs
 
@@ -54,6 +58,7 @@ def _download_zenodo_opxrd(cls, output_fpath : str):
 
         print(f'- Downloading opXRD database from Zenodo ({zenodo_url})')
         print(f'- Download chunk progress (Chunk size = 1kB):')
+        time.sleep(0.01)
         tracked_int = TrackedInt(start_value=0, finish_value=total_chunks)
         with open(output_fpath, 'wb') as f:
             for chunk in file_response.iter_content(chunk_size=1024):

opxrd/usage.ipynb

@@ -1,5 +1,6 @@
 import os.path
 import tempfile
+import time
 
 from holytools.devtools import Unittest
 from holytools.userIO import TrackedInt
@@ -35,11 +36,12 @@ def test_as_database_list(self):
         self.assertTrue(len(dbs) > 5)
 
         print(f'- Checking pattern data ok')
-        k = TrackedInt(start_value=0,finish_value=len(dbs))
+        total_num_patterns = sum([len(db.patterns) for db in dbs])
+        k = TrackedInt(start_value=0,finish_value=total_num_patterns)
         for db in dbs:
             for p in db.patterns:
                 self.check_pattern_data(fpath='None',p=p)
-            k.increment()
+                k.increment()
 
     @staticmethod
     def check_pattern_data(fpath: str, p: XrdPattern):