Skip to content

[Cache] fix integration tests #57201

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

Merged
merged 1 commit into from
May 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
fix integration tests
  • Loading branch information
xabbuh committed May 28, 2024
commit a0f9a322e3970dc425e76fef8c772f9d72c94beb
2 changes: 1 addition & 1 deletion phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<env name="ZOOKEEPER_HOST" value="localhost" />
<env name="COUCHBASE_HOST" value="localhost" />
<env name="COUCHBASE_USER" value="Administrator" />
<env name="COUCHBASE_PASS" value="111111%40" />
<env name="COUCHBASE_PASS" value="111111@" />
Copy link
Member Author

Choose a reason for hiding this comment

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

@alexandre-daubois @nicolas-grekas I am not really sure why this is required. Does the CouchbaseCollectionAdapter work differently than the CouchbaseBucketAdapter?

Copy link
Member

@alexandre-daubois alexandre-daubois May 28, 2024

Choose a reason for hiding this comment

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

That was the starting point of #57192 😄

This was changed to ensure that the Couchbase adapter is decoding special chars from password and you're able to put an encoded @ in it. @ is used to separate user:pass from the actual hostname, making it impossible to use the raw value as-is. Special chars decoding is currently done on a case-by-case basis in each DSN adapter parser.

Secondly, why those two classes? If I remember correctly, one of the adapter is deprecated and used for an old version of Couchbase, whereas the other one is the one to use in new application. Those versions are incompatible and only one version is tested in the integration test suite. Otherwise it would require to run two Couchbase instance but that's super complicated (partly because they need different min versions of PHP, among other things).

Copy link
Member Author

Choose a reason for hiding this comment

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

Well, the decoding is not necessary in our integration tests as username and password are passed separately and are not part of the DSN. But that was also the case when we ran tests with the CouchbaseBucketAdapter. That's why I wondered if there was another difference which explains why we need this change to make tests pass.

Copy link
Member

Choose a reason for hiding this comment

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

Not that I can remember 🤔

Copy link
Member

@alexandre-daubois alexandre-daubois May 28, 2024

Choose a reason for hiding this comment

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

I had some hard times debugging this adapter, it is (very) complicated to test on a local machine. The fact it is unstable on the CI makes me wonder even more if this shouldn't be deprecated. The version supported by our adapter is old and no contributions seems planned to bring support for newer versions. I think the question of the deprecation arises.

</php>

<testsuites>
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Cache/phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<env name="MEMCACHED_HOST" value="localhost" />
<env name="COUCHBASE_HOST" value="localhost" />
<env name="COUCHBASE_USER" value="Administrator" />
<env name="COUCHBASE_PASS" value="111111%40" />
<env name="COUCHBASE_PASS" value="111111@" />
</php>

<testsuites>
Expand Down
Loading