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.

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

Fix for failing test in master #23751

Merged
merged 1 commit into from
Jun 10, 2022

Conversation

eileenmcnaughton
Copy link
Contributor

@eileenmcnaughton eileenmcnaughton commented Jun 10, 2022

Overview

Fix for failing test in master

Before

image

After

fixed

Technical Details

There is a failing test in master because of a sequence of events - two PRs were merged at once resulting in a real conflict - so we rush merged the PR that addressed that - but a test fail got in - the reason was the NOT ! got missed in the last patch - when converting
$onDuplicate != CRM_Import_Parser::DUPLICATE_UPDATE
to $this-isUpdateExisting() -

However, in the fix I also moved it to the validate function as anything that can be determined without db look ups belongs in validate

image

Comments

@civibot
Copy link

civibot bot commented Jun 10, 2022

(Standard links)

@eileenmcnaughton
Copy link
Contributor Author

Since this is blocking all other tests I'm going to self-merge it - also the fail is due to me self-merging to hustle past the worse error before it

@eileenmcnaughton eileenmcnaughton merged commit 4b377f0 into civicrm:master Jun 10, 2022
@eileenmcnaughton eileenmcnaughton deleted the test_member branch June 10, 2022 04:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant