Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jamf Pro: fix flaky system tests #12689

Merged
merged 6 commits into from
Feb 14, 2025
+77 −9
Merged

Jamf Pro: fix flaky system tests #12689

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6798f88
Fix Jamf Pro system tests
chemamartinez Feb 10, 2025
79b7876
Merge branch 'main' into 12314-fix-jamf_pro-system_tests
chemamartinez Feb 11, 2025
9b219ef
Merge branch 'main' into 12314-fix-jamf_pro-system_tests
chemamartinez Feb 12, 2025
6e62591
Document page_size limitation
chemamartinez Feb 12, 2025
bb83c61
Add last report date check
chemamartinez Feb 13, 2025
55d1b3a
Fix CEL formatting
chemamartinez Feb 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 58 additions & 1 deletion packages/jamf_pro/_dev/deploy/docker/files/config.yml
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we still need to change the tests?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same reason as for the page size limitation.

Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,65 @@ rules:
- status_code: 200
body: |
{
"totalCount": 2,
"totalCount": 3,
"results": [
{
"id": "3",
"udid": "5982CE36-4526-580B-B4B9-ECC6782535BB",
"general": {
"name": "acme-C07DM3AZQ6NV",
"lastReportedIp": "10.122.26.87",
"lastIpAddress": "10.122.26.87",
"jamfBinaryVersion": "11.4.1-t1712591696",
"platform": "Mac",
"barcode1": "null",
"remoteManagement": {
"managed": true
},
"supervised": false,
"mdmCapable": {
"capable": false,
"capableUsers": []
},
"reportDate": "2024-06-19T15:54:37.68Z",
"lastContactTime": "2024-04-18T14:26:51.514Z",
"lastEnrolledDate": "2023-02-22T10:46:17.199Z",
"initialEntryDate": "2024-06-19",
"site": {
"id": "-1",
"name": "None"
},
"itunesStoreAccountActive": false,
"enrolledViaAutomatedDeviceEnrollment": false,
"userApprovedMdm": false,
"declarativeDeviceManagementEnabled": false,
"managementId": "1a59c510-b3a9-41cb-8afa-3d4187ac60d0",
"extensionAttributes": []
},
"diskEncryption": null,
"localUserAccounts": null,
"purchasing": null,
"printers": null,
"storage": null,
"applications": null,
"userAndLocation": null,
"configurationProfiles": null,
"services": null,
"plugins": null,
"hardware": null,
"certificates": null,
"attachments": null,
"packageReceipts": null,
"fonts": null,
"security": null,
"operatingSystem": null,
"licensedSoftware": null,
"softwareUpdates": null,
"groupMemberships": null,
"extensionAttributes": null,
"contentCaching": null,
"ibeacons": null
},
{
"id": "3",
"udid": "5982CE36-4526-580B-B4B9-ECC6782535BC",
Expand Down
5 changes: 2 additions & 3 deletions packages/jamf_pro/data_stream/inventory/_dev/test/system/test-inventory-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@ vars:
api_host: http://{{Hostname}}:{{Port}}
client_secret: test_client_secret
client_id: test_client_id
token_url: http://{{Hostname}}:{{Port}}/oauth2/token
data_stream:
vars:
interval: 24h
page_size: 1
page_size: 2
enable_request_tracer: false
enable_section_general: false
enable_section_hardware: false
enable_section_operating_system: true
assert:
hit_count: 2
hit_count: 3