rename id to uid (fixes #43 via #44)

Author: sseliverstov

allure-pytest/src/allure/listener.py

@@ -54,11 +54,11 @@ def pytest_runtest_protocol(self, item, nextitem):
             group_uuid = self._cache.get(fixturedef)
             if not group_uuid:
                 group_uuid = self._cache.set(fixturedef)
-                group = TestResultContainer(id=group_uuid)
+                group = TestResultContainer(uuid=group_uuid)
                 self.allure_logger.start_group(group_uuid, group)
             self.allure_logger.update_group(group_uuid, children=uuid)
 
-        test_case = TestResult(name=item.name, id=uuid)
+        test_case = TestResult(name=item.name, uuid=uuid)
         self.allure_logger.schedule_test(uuid, test_case)
 
         yield
@@ -86,7 +86,7 @@ def pytest_fixture_setup(self, fixturedef, request):
 
         if not container_uuid:
             container_uuid = self._cache.set(fixturedef)
-            container = TestResultContainer(id=container_uuid)
+            container = TestResultContainer(uuid=container_uuid)
             self.allure_logger.start_group(container_uuid, container)
 
         self.allure_logger.update_group(container_uuid, start=now())

allure-pytest/src/allure/model2.py

@@ -25,7 +25,7 @@ def _write(report_dir, item, glob):
 
 @attrs
 class TestResultContainer(object):
-    id = attrib(default=None)
+    uuid = attrib(default=None)
     name = attrib(default=None)
     children = attrib(default=Factory(list))
     description = attrib(default=None)
@@ -57,7 +57,7 @@ class ExecutableItem(object):
 
 @attrs
 class TestResult(ExecutableItem):
-    id = attrib(default=None)
+    uuid = attrib(default=None)
     fullName = attrib(default=None)
     labels = attrib(default=Factory(list))
     links = attrib(default=Factory(list))

allure-pytest/test/matchers/group.py

@@ -14,7 +14,7 @@ def _matches(self, item):
         return has_property('test_containers',
                             has_item(
                                      all_of(
-                                            has_entry('children', has_item(item['id'])),
+                                            has_entry('children', has_item(item['uuid'])),
                                             *self.matchers
                                      )
                             )
@@ -33,11 +33,11 @@ def has_container(report, *matchers):
     ...     test_cases = [
     ...         {
     ...              'fullName': 'test_case',
-    ...              'id': 'test_case_uuid'
+    ...              'uuid': 'test_case_uuid'
     ...         },
     ...         {
     ...              'fullName': 'test_case_without_container',
-    ...              'id': 'test_case_without_container_uuid'
+    ...              'uuid': 'test_case_without_container_uuid'
     ...         }
     ...     ]
     ...     test_containers = [
@@ -82,7 +82,7 @@ def __init__(self, *args):
     def _test_case_id_by_name(report, test_case_name):
         for test_case in report.test_cases:
             if test_case['fullName'].endswith(test_case_name):
-                return test_case['id']
+                return test_case['uuid']
 
     def _matches(self, report):
         return has_property('test_containers',
@@ -109,15 +109,15 @@ def has_same_container(*args):
     ...     test_cases = [
     ...         {
     ...              'fullName': 'first_test_case',
-    ...              'id': 'first_test_case_uuid'
+    ...              'uuid': 'first_test_case_uuid'
     ...         },
     ...         {
     ...              'fullName': 'second_test_case',
-    ...              'id': 'second_test_case_uuid'
+    ...              'uuid': 'second_test_case_uuid'
     ...         },
     ...         {
     ...              'fullName': 'third_test_case',
-    ...              'id': 'third_test_case_uuid'
+    ...              'uuid': 'third_test_case_uuid'
     ...         }
     ...     ]
     ...     test_containers = [

allure-pytest/test/matchers/item.py

@@ -117,7 +117,7 @@ def has_attachment(attach_type=None, name=None):
 
 
 def with_id():
-    return has_entry('id', not_none())
+    return has_entry('uuid', not_none())
 
 
 def with_status(status):