Problem/Motivation

The tests in #2427909: Move crm_core_collect into collect project depend on CRM Core, whose 8.x branch is not yet on drupal.org, so they were excluded from the patch.

Proposed resolution

Add the tests again later.

Remaining tasks

  1. Wait for a CRM Core 8.x branch
  2. Collect CRM Core-dependent tests from related issues
  3. Test them
  4. Update it if things have changed
  5. Commit

User interface changes

API changes

CommentFileSizeAuthor
#50 re_add_tests_when_crm-2430111-50.patch12.66 KBmbovan
#47 re_add_tests_when_crm-2430111-47-interdiff.txt2.32 KBmbovan
#47 re_add_tests_when_crm-2430111-47.patch12.66 KBmbovan
#45 re_add_tests_when_crm-2430111-45-interdiff.txt1.08 KBmbovan
#45 re_add_tests_when_crm-2430111-45.patch12.7 KBmbovan
#42 re_add_tests_when_crm-2430111-42.patch12.57 KBmbovan
#38 re_add_tests_when_crm-2430111-38-Dependencies.patch714 bytesmbovan
#36 re_add_tests_when_crm-2430111-36-interdiff.txt333 bytesmbovan
#36 re_add_tests_when_crm-2430111-36.patch13.27 KBmbovan
#33 re_add_tests_when_crm-2430111-33-interdiff.txt383 bytesmbovan
#33 re_add_tests_when_crm-2430111-33.patch12.94 KBmbovan
#28 re_add_tests_when_crm-2430111-28-interdiff.txt494 bytesmbovan
#28 re_add_tests_when_crm-2430111-28.patch12.57 KBmbovan
#26 re_add_tests_when_crm-2430111-26-interdiff.txt1.32 KBmbovan
#26 re_add_tests_when_crm-2430111-26.patch12.58 KBmbovan
#22 re_add_tests_when_crm-2430111-22.patch13.89 KBmbovan
#21 re_add_tests_when_crm-2430111-21.patch13.89 KBmbovan
#20 re_add_tests_when_crm-2430111-20-interdiff.txt958 bytesmbovan
#20 re_add_tests_when_crm-2430111-20.patch14.83 KBmbovan
#19 re_add_tests_when_crm-2430111-19-interdiff.txt445 bytesmbovan
#19 re_add_tests_when_crm-2430111-19.patch13.89 KBmbovan
#18 re_add_tests_when_crm-2430111-18-interdiff.txt1.31 KBmbovan
#18 re_add_tests_when_crm-2430111-18.patch13.8 KBmbovan
#16 re_add_tests_when_crm-2430111-16-old-tests-interdiff.txt5.81 KBmbovan
#16 re_add_tests_when_crm-2430111-16-old-tests.patch27.72 KBmbovan
#16 re_add_tests_when_crm-2430111-16-interdiff.txt4.62 KBmbovan
#16 re_add_tests_when_crm-2430111-16.patch12.49 KBmbovan
#14 re_add_tests_when_crm-2430111-14-interdiff.txt1.16 KBmbovan
#14 re_add_tests_when_crm-2430111-14.patch39.75 KBmbovan
#13 re_add_tests_when_crm-2430111-13-interdiff.txt3.11 KBmbovan
#13 re_add_tests_when_crm-2430111-13.patch39.95 KBmbovan
#12 crm_tests-2430111-12.patch39.75 KBarla
#12 crm_tests-2430111-12.interdiff.txt8.84 KBarla
#11 crm_tests-2430111-11.patch39.87 KBarla
#11 crm_tests-2430111-11.interdiff.txt2.82 KBarla
#10 crm_tests-2430111-10.patch38.11 KBarla
#10 crm_tests-2430111-10.interdiff.txt3.58 KBarla
#9 re_add_tests_when_crm-2430111-9.patch37.32 KBmbovan
#8 re_add_tests_when_crm-2430111-8-interdiff.txt3.94 KBmbovan
#8 re_add_tests_when_crm-2430111-8.patch19.03 KBmbovan
#7 re_add_tests_when_crm-2430111-7-interdiff.txt3.49 KBmbovan
#7 re_add_tests_when_crm-2430111-7.patch34.68 KBmbovan
#6 crm_tests-2430111-6.interdiff.txt5.3 KBarla
#6 crm_tests-2430111-6.patch34.42 KBarla
#5 crm_tests-2430111-5.interdiff.txt7.29 KBarla
#5 crm_tests-2430111-5.patch33.24 KBarla
#4 crm_tests-2430111-4.interdiff.txt5.73 KBarla
#4 crm_tests-2430111-4.patch32.66 KBarla
#2 crm_test-2430111-2.patch27.47 KBarla
#1 crm-test-2430111-1.patch9.53 KBarla

Comments

arla’s picture

StatusFileSize
new9.53 KB
arla’s picture

Issue summary: View changes
StatusFileSize
new27.47 KB

I just realised that the other test also depends on CRM Core.

arla’s picture

Title: Re-add CRM test » Re-add tests when CRM Core is on drupal.org
Issue summary: View changes
arla’s picture

StatusFileSize
new32.66 KB
new5.73 KB

Added ProcessContactTest from #2441871: Make post-processing configurable and updated EventProcessingTest.

arla’s picture

arla’s picture

StatusFileSize
new34.42 KB
new5.3 KB

Updated ProcessContactTest in #2441979: Processor: Create CRM Activity

mbovan’s picture

Updated EventProcessingTest, ProcessContactTest and EventSubscriberTest in #2475937: Update collect_crm_core_contact module with latest changes

mbovan’s picture

Updated EventProcessingTest and extended ProcessContactTestwith the changes in #2476539: Extend contact matcher and contact creation to support user URIs.

mbovan’s picture

StatusFileSize
new37.32 KB

Oops, some tests are missing... Here is the full patch.

arla’s picture

arla’s picture

arla’s picture

mbovan’s picture

Updated failing EventSubscriberTest and ProcessContactTest with the latest Collect changes, changed some doc comments.

mbovan’s picture

miro_dietiker’s picture

Issue tags: +crm core
mbovan’s picture

Updated and fixed ProcessContactTest with the changes made in CRM Core/Collect. It is passing now and it is part of re_add_tests_when_crm-2430111-16.patch.

Also updated and fixed what is possible in EventProcessingTest (CRM Core, Collect changes, schema errors...) but it is failing on processing. I guess that is because of #2441983: Remove event-based processing. When we complete related issue the code will be changed again.

EventSubscriberTest tests removed EventSubscriber code, so the test should be removed too. However, adding these 2 files as a part of re_add_tests_when_crm-2430111-16-old-tests.patch...

I'll replace the patch we use on D8 status (for additional CRM testing) with re_add_tests_when_crm-2430111-16.patch.

miro_dietiker’s picture

Hm... We should decide asap how to proceed with event processing.

Either remove if and also move all related tests to the other issue... so we have a single set of things that are subject to be readded once event processing is a topic again.

Or we discuss and decide how to deal with delayed post processing. (And possibly readd it the way we want it.)

mbovan’s picture

Expanding CRM tests with CollectDemoTest from #2519966: Demo article is not displayed on the front page.

It will be included in D8 status testing from today.

mbovan’s picture

StatusFileSize
new13.89 KB

The updates mentioned above will be fixed in #2580413: Remove target_bundle setting from Collect Demo config files. Uploading the old patch.

mbovan’s picture

Status: Postponed » Needs review
StatusFileSize
new13.89 KB

Since CRM Core is now on d.o we can reupload the last patch for testing.

Status: Needs review » Needs work

The last submitted patch, 22: re_add_tests_when_crm-2430111-22.patch, failed testing.

mbovan’s picture

The last submitted patch, 22: re_add_tests_when_crm-2430111-22.patch, failed testing.

mbovan’s picture

Status: Needs work » Needs review
StatusFileSize
new12.58 KB
new1.32 KB

Since CollectDemoTest is going to be fixed and added in #2693507: Fix schema errors in Collect demo, we can upload ProcessContactTest here.

berdir’s picture

I think it might be easier to just wait for #2691343: Merge crm_core_activity_ui into crm_core_activity to land, then we can fix the changed dependencies before committing it.

mbovan’s picture

Status: Needs review » Needs work

The last submitted patch, 28: re_add_tests_when_crm-2430111-28.patch, failed testing.

miro_dietiker’s picture

Hm, testbot tries to checkout crm_core twice. Strange error.

The last submitted patch, 28: re_add_tests_when_crm-2430111-28.patch, failed testing.

mbovan’s picture

It looks like testbot tries to checkout to 8.x-2.x branch of CRM Core where we don't have #2691343: Merge crm_core_activity_ui into crm_core_activity committed.

mbovan’s picture

Status: Needs work » Needs review
StatusFileSize
new12.94 KB
new383 bytes

Updated version dependencies in Collect CRM module.

Status: Needs review » Needs work

The last submitted patch, 33: re_add_tests_when_crm-2430111-33.patch, failed testing.

mbovan’s picture

The same error should be because of the Testbot dependency-reload process:

I changed dependencies in my .info file, but the wrong dependencies are still being loaded on test Dependencies only get built when the new dev release is rolled, every 12 hours. So if you change dependencies, it won't be reflected until the new dev tarball is rolled.

Edit: This probably means we have to commit dependency changes and wait at most 12 hours...

mbovan’s picture

Status: Needs work » Needs review
StatusFileSize
new13.27 KB
new333 bytes

One more change.

Edit: Adding version dependencies prevents me to enable the module locally. I get: "Module collect_demo cannot be enabled because it depends on crm_core_contact (1.x) but 1.x-dev is available"

Status: Needs review » Needs work

The last submitted patch, 36: re_add_tests_when_crm-2430111-36.patch, failed testing.

mbovan’s picture

Status: Needs work » Needs review
StatusFileSize
new714 bytes

Added a dependencies patch with correct versions.

Testbot is doing checkout 8.x-1.x and then on 8.x-2.x. Do we need to add version dependencies in CRM Core as well? (crm_core_match.info, crm_core_activity.info etc)

Status: Needs review » Needs work

The last submitted patch, 38: re_add_tests_when_crm-2430111-38-Dependencies.patch, failed testing.

  • Berdir committed 878dee0 on 8.x-1.x authored by mbovan
    Issue #2430111 by mbovan: Added version dependencies to ensure that...
berdir’s picture

Committed that patch.

mbovan’s picture

Status: Needs work » Needs review
StatusFileSize
new12.57 KB

Thanks. Here is the test patch.

Status: Needs review » Needs work

The last submitted patch, 42: re_add_tests_when_crm-2430111-42.patch, failed testing.

The last submitted patch, 42: re_add_tests_when_crm-2430111-42.patch, failed testing.

mbovan’s picture

Status: Needs work » Needs review
StatusFileSize
new12.7 KB
new1.08 KB

This should fix "Block" issue.

Edit: I guess the other test fails are related to broken access check which will be fixed after #2696669: Incomplete/broken access checking in EntityController::addPage() and #2691337: Merge crm_core_contacts_ui into crm_core_contacts.

There is another error that we get while creating an "entity_test" entity which occurs with #43 (access check) and #39 (merge contact).

SQLSTATE[42S22]: Column not found: 1054 Unknown column 'uuid' in 'field list': INSERT INTO {entity_test} (type, uuid, langcode, name, created, user_id) VALUES (:db_insert_placeholder_0, :db_insert_placeholder_1, :db_insert_placeholder_2, :db_insert_placeholder_3, :db_insert_placeholder_4, :db_insert_placeholder_5); Array
(
    [:db_insert_placeholder_0] => gift
    [:db_insert_placeholder_1] => 4a023cd3-5ba2-4f38-8592-077c375dbf2a
    [:db_insert_placeholder_2] => en
    [:db_insert_placeholder_3] => Cookie
    [:db_insert_placeholder_4] => 1460111563
    [:db_insert_placeholder_5] => 1
)

Status: Needs review » Needs work

The last submitted patch, 45: re_add_tests_when_crm-2430111-45.patch, failed testing.

mbovan’s picture

Status: Needs work » Needs review
StatusFileSize
new12.66 KB
new2.32 KB

Ok, this patch passes locally with #43 (access check) and #39 (merge contact) patches applied.

Status: Needs review » Needs work

The last submitted patch, 47: re_add_tests_when_crm-2430111-47.patch, failed testing.

The last submitted patch, 47: re_add_tests_when_crm-2430111-47.patch, failed testing.

mbovan’s picture

  • Berdir committed 94c4996 on 8.x-1.x authored by mbovan
    Issue #2430111 by mbovan, Arla: Re-add tests when CRM Core is on drupal....
berdir’s picture

Status: Needs review » Fixed

And.. finally in ;)

Status: Fixed » Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.