Merge pull request #391 from aiven/hacka-fix-flakiness

Fix flakiness

.github/workflows/tests.yml

@@ -35,9 +35,11 @@ jobs:
       run: make karapace/version.py
 
     - name: Execute unit-tests
+      timeout-minutes: 2
       run: python3 -m pytest -s -vvv tests/unit/
 
     - name: Execute integration-tests
+      timeout-minutes: 10
       run: python3 -m pytest -s -vvv tests/integration/ --log-dir=/tmp/ci-logs --log-file=/tmp/ci-logs/pytest.log
 
     - name: Archive logs

karapace/schema_backup.py

@@ -11,7 +11,7 @@
 from karapace.anonymize_schemas import anonymize_avro
 from karapace.config import Config, read_config
 from karapace.schema_reader import KafkaSchemaReader
-from karapace.utils import json_encode, KarapaceKafkaClient
+from karapace.utils import json_encode, KarapaceKafkaClient, Timeout
 from typing import Dict, List, Optional, Tuple
 
 import argparse
@@ -26,10 +26,6 @@ class BackupError(Exception):
     """Backup Error"""
 
 
-class Timeout(Exception):
-    """Timeout Error"""
-
-
 class SchemaBackup:
     def __init__(self, config: Config, backup_path: str, topic_option: Optional[str] = None) -> None:
         self.config = config

requirements-dev.txt

@@ -10,6 +10,7 @@ pytest==6.2.5
 pytest-xdist[psutil]==2.2.1
 pytest-timeout==1.4.2
 pdbpp==0.10.2
+psutil==5.9.0
 
 # workflow
 pre-commit>=2.2.0