[midPoint-git] [Evolveum/midpoint] 27a309: Stabilize AbstractSynchronizationStoryTest
mederly
noreply at github.com
Wed Apr 6 20:37:30 CEST 2022
Branch: refs/heads/tmp/fixes-after-4.5
Home: https://github.com/Evolveum/midpoint
Commit: 27a309f7c0050c55b3b4c2c51dd3582a03754b29
https://github.com/Evolveum/midpoint/commit/27a309f7c0050c55b3b4c2c51dd3582a03754b29
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2022-04-04 (Mon, 04 Apr 2022)
Changed paths:
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestSyncStoryUsingLiveSync.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestSyncStoryUsingReconciliation.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestSyncStoryUsingReconciliationMultiNode.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestSyncStoryUsingReconciliationMultithreaded.java
R model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestSyncStoryUsingReconciliationPartitioned.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestSyncStoryUsingReconciliationPlain.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestSyncStoryUsingReconciliationWithSubtasks.java
M model/model-intest/src/test/resources/common/resource-dummy-blue.xml
M model/model-intest/src/test/resources/common/resource-dummy-green.xml
M model/model-intest/src/test/resources/common/resource-dummy.xml
R model/model-intest/src/test/resources/common/task-delete-not-updated-shadows.xml
R model/model-intest/src/test/resources/common/task-dumy-blue-livesync.xml
R model/model-intest/src/test/resources/common/task-dumy-green-livesync.xml
R model/model-intest/src/test/resources/common/task-dumy-livesync.xml
R model/model-intest/src/test/resources/common/task-reconcile-dummy-blue-multinode.xml
R model/model-intest/src/test/resources/common/task-reconcile-dummy-blue-multithreaded.xml
R model/model-intest/src/test/resources/common/task-reconcile-dummy-blue-partitioned.xml
R model/model-intest/src/test/resources/common/task-reconcile-dummy-blue.xml
R model/model-intest/src/test/resources/common/task-reconcile-dummy-green-multinode.xml
R model/model-intest/src/test/resources/common/task-reconcile-dummy-green-multithreaded.xml
R model/model-intest/src/test/resources/common/task-reconcile-dummy-green-partitioned.xml
R model/model-intest/src/test/resources/common/task-reconcile-dummy-green.xml
R model/model-intest/src/test/resources/common/task-reconcile-dummy-multinode.xml
R model/model-intest/src/test/resources/common/task-reconcile-dummy-multithreaded.xml
R model/model-intest/src/test/resources/common/task-reconcile-dummy-partitioned.xml
R model/model-intest/src/test/resources/common/user-template-sync.xml
A model/model-intest/src/test/resources/sync-story/task-live-sync-dummy-blue.xml
A model/model-intest/src/test/resources/sync-story/task-live-sync-dummy-green.xml
A model/model-intest/src/test/resources/sync-story/task-live-sync-dummy.xml
A model/model-intest/src/test/resources/sync-story/task-reconcile-dummy-blue-multinode.xml
A model/model-intest/src/test/resources/sync-story/task-reconcile-dummy-blue-multithreaded.xml
A model/model-intest/src/test/resources/sync-story/task-reconcile-dummy-blue-with-subtasks.xml
A model/model-intest/src/test/resources/sync-story/task-reconcile-dummy-blue.xml
A model/model-intest/src/test/resources/sync-story/task-reconcile-dummy-green-multinode.xml
A model/model-intest/src/test/resources/sync-story/task-reconcile-dummy-green-multithreaded.xml
A model/model-intest/src/test/resources/sync-story/task-reconcile-dummy-green-with-subtasks.xml
A model/model-intest/src/test/resources/sync-story/task-reconcile-dummy-green.xml
A model/model-intest/src/test/resources/sync-story/task-reconcile-dummy-multinode.xml
A model/model-intest/src/test/resources/sync-story/task-reconcile-dummy-multithreaded.xml
A model/model-intest/src/test/resources/sync-story/task-reconcile-dummy-with-subtasks.xml
A model/model-intest/src/test/resources/sync-story/task-reconcile-dummy.xml
A model/model-intest/src/test/resources/sync-story/task-shadow-cleanup-green.xml
A model/model-intest/src/test/resources/sync-story/user-template-sync.xml
M model/model-intest/testng-db-specific.xml
M model/model-intest/testng-integration-full.xml
Log Message:
-----------
Stabilize AbstractSynchronizationStoryTest
These tests were unstable from the day one. The concurrent nature
of synchronization tasks led to a whole spectrum of various failures.
But we don't consider them important, because we want to concentrate
only on the basic functionality of multi-resource synchronization here.
So now we changed these tests so that concurrent execution is avoided.
Other changes:
1. Some test artifacts (tasks, sync object template) were moved from
`common` directory to test-specific `sync-story` one. This is to lessen
the potential for coupling between the tests. (They weren't used in
other tests, anyway.)
2. The test code was modernized a bit.
Commit: 7fe176ea2ad14a83554a80c7359cdd95115af0ef
https://github.com/Evolveum/midpoint/commit/7fe176ea2ad14a83554a80c7359cdd95115af0ef
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2022-04-04 (Mon, 04 Apr 2022)
Changed paths:
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestSyncStoryUsingLiveSync.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestSyncStoryUsingReconciliation.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestSyncStoryUsingReconciliationMultiNode.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestSyncStoryUsingReconciliationMultithreaded.java
R model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestSyncStoryUsingReconciliationPartitioned.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestSyncStoryUsingReconciliationPlain.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestSyncStoryUsingReconciliationWithSubtasks.java
M model/model-intest/src/test/resources/common/resource-dummy-blue.xml
M model/model-intest/src/test/resources/common/resource-dummy-green.xml
M model/model-intest/src/test/resources/common/resource-dummy.xml
R model/model-intest/src/test/resources/common/task-delete-not-updated-shadows.xml
R model/model-intest/src/test/resources/common/task-dumy-blue-livesync.xml
R model/model-intest/src/test/resources/common/task-dumy-green-livesync.xml
R model/model-intest/src/test/resources/common/task-dumy-livesync.xml
R model/model-intest/src/test/resources/common/task-reconcile-dummy-blue-multinode.xml
R model/model-intest/src/test/resources/common/task-reconcile-dummy-blue-multithreaded.xml
R model/model-intest/src/test/resources/common/task-reconcile-dummy-blue-partitioned.xml
R model/model-intest/src/test/resources/common/task-reconcile-dummy-blue.xml
R model/model-intest/src/test/resources/common/task-reconcile-dummy-green-multinode.xml
R model/model-intest/src/test/resources/common/task-reconcile-dummy-green-multithreaded.xml
R model/model-intest/src/test/resources/common/task-reconcile-dummy-green-partitioned.xml
R model/model-intest/src/test/resources/common/task-reconcile-dummy-green.xml
R model/model-intest/src/test/resources/common/task-reconcile-dummy-multinode.xml
R model/model-intest/src/test/resources/common/task-reconcile-dummy-multithreaded.xml
R model/model-intest/src/test/resources/common/task-reconcile-dummy-partitioned.xml
R model/model-intest/src/test/resources/common/user-template-sync.xml
A model/model-intest/src/test/resources/sync-story/task-live-sync-dummy-blue.xml
A model/model-intest/src/test/resources/sync-story/task-live-sync-dummy-green.xml
A model/model-intest/src/test/resources/sync-story/task-live-sync-dummy.xml
A model/model-intest/src/test/resources/sync-story/task-reconcile-dummy-blue-multinode.xml
A model/model-intest/src/test/resources/sync-story/task-reconcile-dummy-blue-multithreaded.xml
A model/model-intest/src/test/resources/sync-story/task-reconcile-dummy-blue-with-subtasks.xml
A model/model-intest/src/test/resources/sync-story/task-reconcile-dummy-blue.xml
A model/model-intest/src/test/resources/sync-story/task-reconcile-dummy-green-multinode.xml
A model/model-intest/src/test/resources/sync-story/task-reconcile-dummy-green-multithreaded.xml
A model/model-intest/src/test/resources/sync-story/task-reconcile-dummy-green-with-subtasks.xml
A model/model-intest/src/test/resources/sync-story/task-reconcile-dummy-green.xml
A model/model-intest/src/test/resources/sync-story/task-reconcile-dummy-multinode.xml
A model/model-intest/src/test/resources/sync-story/task-reconcile-dummy-multithreaded.xml
A model/model-intest/src/test/resources/sync-story/task-reconcile-dummy-with-subtasks.xml
A model/model-intest/src/test/resources/sync-story/task-reconcile-dummy.xml
A model/model-intest/src/test/resources/sync-story/task-shadow-cleanup-green.xml
A model/model-intest/src/test/resources/sync-story/user-template-sync.xml
M model/model-intest/testng-db-specific.xml
M model/model-intest/testng-integration-full.xml
Log Message:
-----------
Merge branch 'tmp/fix-sync-story-tests'
Commit: e03df3875031e29ada6d2cb5dbf8a95be08dd189
https://github.com/Evolveum/midpoint/commit/e03df3875031e29ada6d2cb5dbf8a95be08dd189
Author: Richard Richter <richard.richter at evolveum.com>
Date: 2022-04-05 (Tue, 05 Apr 2022)
Changed paths:
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M infra/schema/src/main/resources/xml/ns/public/common/common-tasks-3.xsd
M model/model-impl/src/test/resources/controller/account-with-pwd.xml
M model/model-impl/src/test/resources/controller/account-without-pwd.xml
M model/model-impl/src/test/resources/expr/user-new.xml
Log Message:
-----------
few doc/comment typo fixes in schema and test files
Commit: ec19c2da401f9630d1c063b67db71412df9e3c36
https://github.com/Evolveum/midpoint/commit/ec19c2da401f9630d1c063b67db71412df9e3c36
Author: Richard Richter <richard.richter at evolveum.com>
Date: 2022-04-05 (Tue, 05 Apr 2022)
Changed paths:
M .travis.yml
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/AccountActivationNotifier.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/PasswordResetNotifier.java
M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorFactoryConnIdImpl.java
M repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoModifyObjectTest.java
Log Message:
-----------
fixed bel(l)ow typos
Commit: 571bfaca24eb3c47576c179b9b18a67fd4726b50
https://github.com/Evolveum/midpoint/commit/571bfaca24eb3c47576c179b9b18a67fd4726b50
Author: Richard Richter <richard.richter at evolveum.com>
Date: 2022-04-05 (Tue, 05 Apr 2022)
Changed paths:
M infra/schema/src/main/resources/xml/ns/public/common/common-notifications-3.xsd
Log Message:
-----------
common-notifications-3.xsd: added display order for transport elements
Commit: bbadfcf7dae267722e1b248d59241bf6e34693df
https://github.com/Evolveum/midpoint/commit/bbadfcf7dae267722e1b248d59241bf6e34693df
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2022-04-06 (Wed, 06 Apr 2022)
Changed paths:
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/run/IterativeActivityRun.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/run/TaskCycleExecutor.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/tasks/CloseHelper.java
Log Message:
-----------
Prune operation result after each bucket
This is to avoid uncontrollable growth of task operation result,
resulting in OOMs, extra large repo objects, and/or long task execution.
Should resolve MID-7830 (at least partially).
Commit: 1e429f84f6f26f61c4af1a9d46d74d87994353df
https://github.com/Evolveum/midpoint/commit/1e429f84f6f26f61c4af1a9d46d74d87994353df
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2022-04-06 (Wed, 06 Apr 2022)
Changed paths:
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/run/IterativeActivityRun.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/run/TaskCycleExecutor.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/tasks/CloseHelper.java
Log Message:
-----------
Prune operation result after each bucket
This is to avoid uncontrollable growth of task operation result,
resulting in OOMs, extra large repo objects, and/or long task execution.
Should resolve MID-7830 (at least partially).
Commit: ad2dfc1f055cf520764244d06244da882e9a8a93
https://github.com/Evolveum/midpoint/commit/ad2dfc1f055cf520764244d06244da882e9a8a93
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2022-04-06 (Wed, 06 Apr 2022)
Changed paths:
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/run/IterativeActivityRun.java
Log Message:
-----------
Fix the last result-pruning fix
We cannot call cleanupResult on operation result that is not closed yet!
Related to MID-7830.
Commit: e75d6e54636db2e1cce2b2b2cf975bde9773fb5a
https://github.com/Evolveum/midpoint/commit/e75d6e54636db2e1cce2b2b2cf975bde9773fb5a
Author: Kateryna Honchar <gonchar.kate at gmail.com>
Date: 2022-04-06 (Wed, 06 Apr 2022)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/ItemRefinedPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/ObjectTemplateItemPanel.java
Log Message:
-----------
mid-7820 items cannot be added to object templates
Commit: 04deb49f9a24e93c434c727920d544e28222de72
https://github.com/Evolveum/midpoint/commit/04deb49f9a24e93c434c727920d544e28222de72
Author: Kateryna Honchar <gonchar.kate at gmail.com>
Date: 2022-04-06 (Wed, 06 Apr 2022)
Changed paths:
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/run/IterativeActivityRun.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/run/TaskCycleExecutor.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/tasks/CloseHelper.java
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: f6d3260fa323a79e9948a604352bf1f831e524a6
https://github.com/Evolveum/midpoint/commit/f6d3260fa323a79e9948a604352bf1f831e524a6
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2022-04-06 (Wed, 06 Apr 2022)
Changed paths:
M .travis.yml
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/ItemRefinedPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/ObjectTemplateItemPanel.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M infra/schema/src/main/resources/xml/ns/public/common/common-notifications-3.xsd
M infra/schema/src/main/resources/xml/ns/public/common/common-tasks-3.xsd
M model/model-impl/src/test/resources/controller/account-with-pwd.xml
M model/model-impl/src/test/resources/controller/account-without-pwd.xml
M model/model-impl/src/test/resources/expr/user-new.xml
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestSyncStoryUsingLiveSync.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestSyncStoryUsingReconciliation.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestSyncStoryUsingReconciliationMultiNode.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestSyncStoryUsingReconciliationMultithreaded.java
R model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestSyncStoryUsingReconciliationPartitioned.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestSyncStoryUsingReconciliationPlain.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestSyncStoryUsingReconciliationWithSubtasks.java
M model/model-intest/src/test/resources/common/resource-dummy-blue.xml
M model/model-intest/src/test/resources/common/resource-dummy-green.xml
M model/model-intest/src/test/resources/common/resource-dummy.xml
R model/model-intest/src/test/resources/common/task-delete-not-updated-shadows.xml
R model/model-intest/src/test/resources/common/task-dumy-blue-livesync.xml
R model/model-intest/src/test/resources/common/task-dumy-green-livesync.xml
R model/model-intest/src/test/resources/common/task-dumy-livesync.xml
R model/model-intest/src/test/resources/common/task-reconcile-dummy-blue-multinode.xml
R model/model-intest/src/test/resources/common/task-reconcile-dummy-blue-multithreaded.xml
R model/model-intest/src/test/resources/common/task-reconcile-dummy-blue-partitioned.xml
R model/model-intest/src/test/resources/common/task-reconcile-dummy-blue.xml
R model/model-intest/src/test/resources/common/task-reconcile-dummy-green-multinode.xml
R model/model-intest/src/test/resources/common/task-reconcile-dummy-green-multithreaded.xml
R model/model-intest/src/test/resources/common/task-reconcile-dummy-green-partitioned.xml
R model/model-intest/src/test/resources/common/task-reconcile-dummy-green.xml
R model/model-intest/src/test/resources/common/task-reconcile-dummy-multinode.xml
R model/model-intest/src/test/resources/common/task-reconcile-dummy-multithreaded.xml
R model/model-intest/src/test/resources/common/task-reconcile-dummy-partitioned.xml
R model/model-intest/src/test/resources/common/user-template-sync.xml
A model/model-intest/src/test/resources/sync-story/task-live-sync-dummy-blue.xml
A model/model-intest/src/test/resources/sync-story/task-live-sync-dummy-green.xml
A model/model-intest/src/test/resources/sync-story/task-live-sync-dummy.xml
A model/model-intest/src/test/resources/sync-story/task-reconcile-dummy-blue-multinode.xml
A model/model-intest/src/test/resources/sync-story/task-reconcile-dummy-blue-multithreaded.xml
A model/model-intest/src/test/resources/sync-story/task-reconcile-dummy-blue-with-subtasks.xml
A model/model-intest/src/test/resources/sync-story/task-reconcile-dummy-blue.xml
A model/model-intest/src/test/resources/sync-story/task-reconcile-dummy-green-multinode.xml
A model/model-intest/src/test/resources/sync-story/task-reconcile-dummy-green-multithreaded.xml
A model/model-intest/src/test/resources/sync-story/task-reconcile-dummy-green-with-subtasks.xml
A model/model-intest/src/test/resources/sync-story/task-reconcile-dummy-green.xml
A model/model-intest/src/test/resources/sync-story/task-reconcile-dummy-multinode.xml
A model/model-intest/src/test/resources/sync-story/task-reconcile-dummy-multithreaded.xml
A model/model-intest/src/test/resources/sync-story/task-reconcile-dummy-with-subtasks.xml
A model/model-intest/src/test/resources/sync-story/task-reconcile-dummy.xml
A model/model-intest/src/test/resources/sync-story/task-shadow-cleanup-green.xml
A model/model-intest/src/test/resources/sync-story/user-template-sync.xml
M model/model-intest/testng-db-specific.xml
M model/model-intest/testng-integration-full.xml
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/AccountActivationNotifier.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/PasswordResetNotifier.java
M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorFactoryConnIdImpl.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/run/IterativeActivityRun.java
M repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoModifyObjectTest.java
Log Message:
-----------
Merge branch 'master' into tmp/fixes-after-4.5
# Conflicts:
# repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/run/IterativeActivityRun.java
Commit: 06df862e9f03f42ab94bd7128bac854b96ebb55b
https://github.com/Evolveum/midpoint/commit/06df862e9f03f42ab94bd7128bac854b96ebb55b
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2022-04-06 (Wed, 06 Apr 2022)
Changed paths:
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/activity/ClassicCollectionReportExportActivityRun.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/activity/ClassicDashboardReportExportActivityRun.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/activity/ClassicReportImportActivityRun.java
M repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/tasks/handlers/iterative/IterativeMockActivityRun.java
Log Message:
-----------
Fix suspension of report-related activities
Report-related activities (both export and import) ignored signals
to suspend that come from the activity framework. So even if the task
was suspended, report processes continued to iterate through input
objects.
This is now fixed. The iteration should stop when the task goes down.
Related to MID-7839.
Compare: https://github.com/Evolveum/midpoint/compare/569fec12c7dd...06df862e9f03
More information about the midPoint-svn
mailing list