Closed evgeniiz321 closed 9 months ago
I'd expect to see some clear merge that solves #31 and then any additional things as a set of commits on top of it, looks like at the moment they're all mixed into the merge commit itself. Squashing is not an option.
Maybe they can't be separated though, I've not tried merging them to judge what number of conflicts there is and is there any possibility to solve them without a lot of changes in the merge commit itself.
It is too painful to separate commits or to do smth with these commits structure (except just squashing), so I'd prefer not to do anything with it. At first I thought it would be much easier just to refork the repo. Conflicts are almost everywhere, test_s3.py (16337 lines) is just a one big conflict that very hard to process.
The list of changes:
s3tests_boto3/functional/test_s3.py
ands3tests_boto3/functional/test_s3_neofs.py
One thing about commits - I can squash everything into the one big commit or leave it as is - with a history of commits from the upstream. I prefer squashing, but perhaps history will be useful in the future - during test failures investigation.
Further plan:
s3tests_boto3/functional/test_s3_neofs.py
, open corresponding bugs; since these tests were specifically written for neofs - they should pass + there are not so many of them.s3tests_boto3/functional/test_s3.py
- investigate everything that is not marked withfails_on_aws
orfails_on_dbstore
- this is a huge effort, so we will need to prioritise skipped tests.fails_on_aws
orfails_on_dbstore