[midPoint-git] [Evolveum/midpoint] 631619: Fix failing TestImportRecon

mederly noreply at github.com
Tue Mar 10 00:49:47 CET 2020


  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 6316193a1a5c7a2f1f762cc77c0593f668c01b39
      https://github.com/Evolveum/midpoint/commit/6316193a1a5c7a2f1f762cc77c0593f668c01b39
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-03-10 (Tue, 10 Mar 2020)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java

  Log Message:
  -----------
  Fix failing TestImportRecon

We need to be careful when using checkSubresult parameter while
waiting for task finish.


  Commit: 154a42c3e0aac662cef441d290dc7da76d9773a7
      https://github.com/Evolveum/midpoint/commit/154a42c3e0aac662cef441d290dc7da76d9773a7
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-03-10 (Tue, 10 Mar 2020)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/TestRefinedSchema.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestUuid.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestValidityRecomputeTaskPartitioned.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/TestReport.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestSynchronization.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskManager.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/ExecutionManager.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/JobExecutor.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/LocalNodeManager.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/StalledTasksWatcher.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/TaskSynchronizer.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/handlers/PartitioningTaskHandler.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/WorkStateManager.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/workers/WorkersManager.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/AbstractTaskManagerTest.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestPartitioning.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestTaskManagerContract.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestWorkBucketStrategies.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestWorkDistribution.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestWorkersManagement.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenLdap.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/AbstractAdLdapTest.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java

  Log Message:
  -----------
  Revert getTask in tests to the "plain" version

This commit removes all the special treatment of Quartz and live
information to task in getTask method, renaming it to getTaskPlain.
(This might not be the definite name, though.)

This should fix recent test failures.


  Commit: 7ae7f6d04c9cdc16252b5e10cdb868394ad25b26
      https://github.com/Evolveum/midpoint/commit/7ae7f6d04c9cdc16252b5e10cdb868394ad25b26
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-03-10 (Tue, 10 Mar 2020)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/ComponentConstants.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/CaseSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskTabsVisibility.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


Compare: https://github.com/Evolveum/midpoint/compare/75981736604e...7ae7f6d04c9c


More information about the midPoint-svn mailing list