Skip to content

Commit c65dde3

Browse files
alvarolopezalvarolopez
committed
Remove tzinfo also on tests
1 parent e25df4d commit c65dde3

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

‎caso/tests/conftest.py

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import caso
2424
import caso.record
2525

26-
now = datetime.datetime(2023, 5, 25, 21, 59, 6, 0)
26+
now = datetime.datetime(2023, 5, 25, 21, 59, 6, 0, tzinfo=datetime.timezone.utc)
2727
cloud_type = caso.user_agent
2828

2929
valid_cloud_records_fields = [
@@ -76,8 +76,8 @@
7676
"CpuDuration": 3456000,
7777
"CloudType": cloud_type,
7878
"Disk": 250,
79-
"StartTime": 1684612746,
80-
"EndTime": 1685044746,
79+
"StartTime": 1684619946,
80+
"EndTime": 1685051946,
8181
"FQAN": "VO 1 FQAN",
8282
"GlobalUserName": "User DN",
8383
"ImageId": "b39a8ed9-e15d-4b71-ada2-daf88efbac0a",
@@ -97,8 +97,8 @@
9797
"CpuDuration": 3456000,
9898
"CloudType": cloud_type,
9999
"Disk": 250,
100-
"StartTime": 1684526346,
101-
"EndTime": 1685044746,
100+
"StartTime": 1684533546,
101+
"EndTime": 1685051946,
102102
"FQAN": "VO 2 FQAN",
103103
"GlobalUserName": "User DN",
104104
"ImageId": "b39a8ed9-e15d-4b71-ada2-daf88efbac0a",
@@ -153,7 +153,7 @@
153153
"IPVersion": 4,
154154
"LocalGroup": "03b6a6c4-cf2b-48b9-82f1-69c52b9f30af",
155155
"LocalUser": "a4519d7d-f60a-4908-9d63-7d9e17422188",
156-
"MeasurementTime": 1685044746,
156+
"MeasurementTime": 1685051946,
157157
"SiteName": "TEST-Site",
158158
"uuid": "e3c5aeef-37b8-4332-ad9f-9d068f156dc2",
159159
"CloudType": cloud_type,
@@ -166,7 +166,7 @@
166166
"IPVersion": 4,
167167
"LocalGroup": "2dae43c4-1889-4e63-b172-d4e99381e30a",
168168
"LocalUser": "3391a44e-3728-478d-abde-b86c25356571",
169-
"MeasurementTime": 1685044746,
169+
"MeasurementTime": 1685051946,
170170
"SiteName": "TEST-Site",
171171
"uuid": "5c50720e-a653-4d70-9b0e-d4388687fcbc",
172172
"CloudType": cloud_type,
@@ -272,7 +272,7 @@ def expected_entries_cloud():
272272
"CpuCount: 8\n"
273273
"CpuDuration: 3456000\n"
274274
"Disk: 250\n"
275-
"EndTime: 1685044746\n"
275+
"EndTime: 1685051946\n"
276276
"FQAN: VO 1 FQAN\n"
277277
"GlobalUserName: User DN\n"
278278
"ImageId: b39a8ed9-e15d-4b71-ada2-daf88efbac0a\n"
@@ -282,7 +282,7 @@ def expected_entries_cloud():
282282
"Memory: 16\n"
283283
"PublicIPCount: 7\n"
284284
"SiteName: TEST-Site\n"
285-
"StartTime: 1684612746\n"
285+
"StartTime: 1684619946\n"
286286
"Status: started\n"
287287
"VMUUID: 721cf1db-0e0f-4c24-a5ea-cd75e0f303e8\n"
288288
"WallDuration: 432000",
@@ -291,7 +291,7 @@ def expected_entries_cloud():
291291
"CpuCount: 8\n"
292292
"CpuDuration: 3456000\n"
293293
"Disk: 250\n"
294-
"EndTime: 1685044746\n"
294+
"EndTime: 1685051946\n"
295295
"FQAN: VO 2 FQAN\n"
296296
"GlobalUserName: User DN\n"
297297
"ImageId: b39a8ed9-e15d-4b71-ada2-daf88efbac0a\n"
@@ -301,7 +301,7 @@ def expected_entries_cloud():
301301
"Memory: 16\n"
302302
"PublicIPCount: 7\n"
303303
"SiteName: TEST-Site\n"
304-
"StartTime: 1684526346\n"
304+
"StartTime: 1684533546\n"
305305
"Status: completed\n"
306306
"VMUUID: a53738e1-13eb-4047-800c-067d14ce3d22\n"
307307
"WallDuration: 432000",
@@ -317,21 +317,21 @@ def expected_message_cloud():
317317
"APEL-cloud-message: v0.4\n"
318318
"CloudComputeService: Fake Cloud Service\n"
319319
f"CloudType: {cloud_type}\nCpuCount: 8\nCpuDuration: 3456000\n"
320-
"Disk: 250\nEndTime: 1685044746\nFQAN: VO 1 FQAN\nGlobalUserName: User DN\n"
320+
"Disk: 250\nEndTime: 1685051946\nFQAN: VO 1 FQAN\nGlobalUserName: User DN\n"
321321
"ImageId: b39a8ed9-e15d-4b71-ada2-daf88efbac0a\n"
322322
"LocalGroupId: 03b6a6c4-cf2b-48b9-82f1-69c52b9f30af\n"
323323
"LocalUserId: a4519d7d-f60a-4908-9d63-7d9e17422188\nMachineName: VM Name 1\n"
324-
"Memory: 16\nPublicIPCount: 7\nSiteName: TEST-Site\nStartTime: 1684612746\n"
324+
"Memory: 16\nPublicIPCount: 7\nSiteName: TEST-Site\nStartTime: 1684619946\n"
325325
"Status: started\nVMUUID: 721cf1db-0e0f-4c24-a5ea-cd75e0f303e8\n"
326326
"WallDuration: 432000\n"
327327
"%%"
328328
"\nCloudComputeService: Fake Cloud Service\n"
329329
f"CloudType: {cloud_type}\nCpuCount: 8\nCpuDuration: 3456000\n"
330-
"Disk: 250\nEndTime: 1685044746\nFQAN: VO 2 FQAN\nGlobalUserName: User DN\n"
330+
"Disk: 250\nEndTime: 1685051946\nFQAN: VO 2 FQAN\nGlobalUserName: User DN\n"
331331
"ImageId: b39a8ed9-e15d-4b71-ada2-daf88efbac0a\n"
332332
"LocalGroupId: 03b6a6c4-cf2b-48b9-82f1-69c52b9f30af\n"
333333
"LocalUserId: a4519d7d-f60a-4908-9d63-7d9e17422188\nMachineName: VM Name 2\n"
334-
"Memory: 16\nPublicIPCount: 7\nSiteName: TEST-Site\nStartTime: 1684526346\n"
334+
"Memory: 16\nPublicIPCount: 7\nSiteName: TEST-Site\nStartTime: 1684533546\n"
335335
"Status: completed\nVMUUID: a53738e1-13eb-4047-800c-067d14ce3d22\n"
336336
"WallDuration: 432000\n"
337337
)
@@ -350,7 +350,7 @@ def expected_entries_ip():
350350
'"GlobalUserName": "User 1 DN", '
351351
'"LocalGroup": "03b6a6c4-cf2b-48b9-82f1-69c52b9f30af", '
352352
'"FQAN": "VO 1 FQAN", '
353-
'"MeasurementTime": 1685044746, '
353+
'"MeasurementTime": 1685051946, '
354354
'"IPVersion": 4, '
355355
'"IPCount": 10}',
356356
'{"SiteName": "TEST-Site", '
@@ -361,7 +361,7 @@ def expected_entries_ip():
361361
'"GlobalUserName": "User 2 DN", '
362362
'"LocalGroup": "2dae43c4-1889-4e63-b172-d4e99381e30a", '
363363
'"FQAN": "VO 2 FQAN", '
364-
'"MeasurementTime": 1685044746, '
364+
'"MeasurementTime": 1685051946, '
365365
'"IPVersion": 6, '
366366
'"IPCount": 20}',
367367
]
@@ -381,7 +381,7 @@ def expected_message_ip():
381381
'"GlobalUserName": "User 1 DN", '
382382
'"LocalGroup": "03b6a6c4-cf2b-48b9-82f1-69c52b9f30af", '
383383
'"FQAN": "VO 1 FQAN", '
384-
'"MeasurementTime": 1685044746, '
384+
'"MeasurementTime": 1685051946, '
385385
'"IPVersion": 4, '
386386
'"IPCount": 10}, '
387387
'{"SiteName": "TEST-Site", '
@@ -392,7 +392,7 @@ def expected_message_ip():
392392
'"GlobalUserName": "User 2 DN", '
393393
'"LocalGroup": "2dae43c4-1889-4e63-b172-d4e99381e30a", '
394394
'"FQAN": "VO 2 FQAN", '
395-
'"MeasurementTime": 1685044746, '
395+
'"MeasurementTime": 1685051946, '
396396
'"IPVersion": 6, '
397397
'"IPCount": 20}'
398398
"]}"

0 commit comments

Comments
 (0)