Skip to content

Commit 1b6460e

Browse files
committed
[release/2024-11-22] recreate release as release/2024-11-22
1 parent e7464f4 commit 1b6460e

File tree

7 files changed

+21
-4
lines changed

7 files changed

+21
-4
lines changed

.github/workflows/deploy-nonprod-workspace.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
options:
1212
- dev
1313
- qa
14-
- int
14+
# - int
1515
- ref
1616
sandbox:
1717
description: Do you want to deploy the sandbox version?

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Changelog
22

3-
## 2024-11-20
3+
## 2024-11-22
44
- [PI-528] Collapse versioning to v1
55
- [PI-581] MHS Device with Device Reference Data
66

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2024.11.20
1+
2024.11.22
File renamed without changes.

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "connecting-party-manager"
3-
version = "2024.11.20"
3+
version = "2024.11.22"
44
description = "Repository for the Connecting Party Manager API and related services"
55
authors = ["NHS England"]
66
license = "LICENSE.md"

src/layers/domain/repository/device_repository/tests/v1/test_device_repository_tags_v1.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import time
12
from collections import defaultdict
23

34
import pytest
@@ -50,6 +51,7 @@ def test__device_repository__multiple_devices_with_same_tags(
5051
repository.write(device)
5152
repository.write(device_with_asid)
5253
repository.write(device_with_mhs_id)
54+
time.sleep(2)
5355

5456
devices = repository.query_by_tag(bar="foo")
5557
assert len(devices) == 3
@@ -115,6 +117,7 @@ def test__device_repository__add_two_tags(device: Device, repository: DeviceRepo
115117
second_device.add_tag(shoe_size=123)
116118
second_device.add_tag(shoe_size=456)
117119
repository.write(second_device)
120+
time.sleep(1)
118121

119122
assert _test_add_two_tags(
120123
device=device, second_device=second_device, repository=repository
@@ -133,6 +136,7 @@ def test__device_repository__add_two_tags_at_once(
133136
)
134137
second_device.add_tags([dict(shoe_size=123), dict(shoe_size=456)])
135138
repository.write(second_device)
139+
time.sleep(1)
136140

137141
assert _test_add_two_tags(
138142
device=device, second_device=second_device, repository=repository
@@ -151,10 +155,12 @@ def test__device_repository__add_two_tags_and_then_clear(
151155
)
152156
second_device.add_tags([dict(shoe_size=123), dict(shoe_size=456)])
153157
repository.write(second_device)
158+
time.sleep(1)
154159

155160
second_device.clear_events()
156161
second_device.clear_tags()
157162
repository.write(second_device)
163+
time.sleep(2)
158164

159165
assert (
160166
repository.read(

src/layers/domain/repository/device_repository/tests/v1/test_device_repository_v1.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import time
12
from copy import deepcopy
23

34
import pytest
@@ -132,6 +133,7 @@ def test__device_repository__update(device: Device, repository: DeviceRepository
132133
intermediate_device.update(name="foo-bar")
133134

134135
repository.write(intermediate_device)
136+
time.sleep(1)
135137

136138
final_device = repository.read(
137139
product_team_id=device.product_team_id,
@@ -150,6 +152,7 @@ def test__device_repository__delete(
150152
device_with_tag: Device, repository: DeviceRepository
151153
):
152154
repository.write(device_with_tag)
155+
time.sleep(1)
153156

154157
read_query = dict(
155158
product_team_id=device_with_tag.product_team_id,
@@ -161,6 +164,7 @@ def test__device_repository__delete(
161164
device = repository.read(**read_query)
162165
device.delete()
163166
repository.write(device)
167+
time.sleep(1)
164168

165169
# Attempt to read the original device, expecting an ItemNotFound error
166170
with pytest.raises(ItemNotFound):
@@ -190,6 +194,7 @@ def test__device_repository__can_delete_second_device_with_same_key(
190194
device = product.create_device(name="OriginalDevice")
191195
device.add_key(key_value=DEVICE_KEY, key_type=DeviceKeyType.PRODUCT_ID)
192196
repository.write(device)
197+
time.sleep(1)
193198

194199
read_query = dict(
195200
product_team_id=device.product_team_id,
@@ -201,6 +206,8 @@ def test__device_repository__can_delete_second_device_with_same_key(
201206
device.clear_events()
202207
device.delete()
203208
repository.write(device)
209+
time.sleep(1)
210+
204211
with pytest.raises(ItemNotFound):
205212
repository.read(**read_query)
206213

@@ -219,11 +226,14 @@ def test__device_repository__can_delete_second_device_with_same_key(
219226
_device = product.create_device(name=f"Device-{i}")
220227
_device.add_key(key_value=DEVICE_KEY, key_type=DeviceKeyType.PRODUCT_ID)
221228
repository.write(_device)
229+
time.sleep(1)
230+
222231
repository.read(**read_query) # passes
223232

224233
_device.clear_events()
225234
_device.delete()
226235
repository.write(_device)
236+
time.sleep(1)
227237
with pytest.raises(ItemNotFound):
228238
repository.read(**read_query)
229239

@@ -252,6 +262,7 @@ def test__device_repository__add_key(device: Device, repository: DeviceRepositor
252262
key_type=DeviceKeyType.PRODUCT_ID, key_value="P.AAA-CCC"
253263
)
254264
repository.write(intermediate_device)
265+
time.sleep(1)
255266

256267
# Read the same device multiple times, indexed by key and id
257268
# to verify that they're all the same

0 commit comments

Comments
 (0)