Merge pull request pklaus#19 from DL6ER/tweak/tests

Include {{random}}, {{uuid}} and {{short-uuid}} in tests

Author: DL6ER

app/labeldesigner/label.py

@@ -197,11 +197,13 @@ def datetime_replacer(match):
 
             # Replace {{uuid}} with a new UUID
             if "{{uuid}}" in line['text']:
-                line['text'] = line['text'].replace("{{uuid}}", str(uuid.uuid4()))
+                ui = uuid.UUID(int=random.getrandbits(128))
+                line['text'] = line['text'].replace("{{uuid}}", str(ui))
 
             # Replace {{short-uuid}} with a shortened UUID
             if "{{short-uuid}}" in line['text']:
-                line['text'] = line['text'].replace("{{short-uuid}}", str(uuid.uuid4())[:8])
+                ui = uuid.UUID(int=random.getrandbits(128))
+                line['text'] = line['text'].replace("{{short-uuid}}", str(ui)[:8])
 
             # Replace {{env:var}} with the value of the environment variable var
             def env_replacer(match):
@@ -215,7 +217,7 @@ def random_replacer(match):
                 return ''.join(random.choices(string.ascii_letters + string.digits + string.punctuation, k=length))
             line['text'] = re.sub(r"\{\{random(?:\:(\d+))?\}\}", random_replacer, line['text'])
 
-    def generate(self, rotate = False):
+    def generate(self, rotate: bool = False):
         # Process possible templates in the text
         self.process_templates()
 

tests/template.png

@@ -5,12 +5,12 @@
 import sys
 import os
 import pytest
-sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
-from app import create_app
-from werkzeug.datastructures import FileStorage
 import io
 import multiprocessing
-from random import choice
+import random
+from werkzeug.datastructures import FileStorage
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
+from app import create_app
 
 UPDATE_IMAGES = False
 EXAMPLE_FORMDATA = {
@@ -403,9 +403,26 @@ def test_generate_template(client):
             'size': '20',
             'align': 'right',
             'inverted': True
+        },
+        {
+            'family': 'DejaVu Sans',
+            'style': 'Book',
+            'text': '>> {{uuid}} {{short-uuid}} <<',
+            'size': '20',
+            'align': 'center'
+        },
+        {
+            'family': 'DejaVu Sans',
+            'style': 'Book',
+            'text': '>> {{random:77}} <<',
+            'size': '10',
+            'align': 'center'
         }
     ])
 
+    # Set random seed to a fixed value for deterministic results of {{random}},
+    # {{uuid}}, and {{short-uuid}}
+    random.seed(12)
     response = client.post('/labeldesigner/api/preview', data=data)
     assert response.status_code == 200
     assert response.content_type in ['image/png']