This also kills test_write_replay.py file since it does not test anything
more than what is currently tested in test_replay.py.
Depends on D3202.
Details
Details
- Reviewers
ardumont - Group Reviewers
Reviewers - Commits
- rDSTOf9b2ca3fec14: Replace MockedJournalClient and MockedKafkaWriter by proper kafka test…
Diff Detail
Diff Detail
- Repository
- rDSTO Storage manager
- Lint
Automatic diff as part of commit; lint not applicable. - Unit
Automatic diff as part of commit; unit tests not applicable.
Event Timeline
Comment Actions
Build is green
Patch application report for D3203 (id=11368)
Could not rebase; Attempt merge onto 6c6080b4d7...
Updating 6c6080b..5dbf353 Fast-forward swh/storage/in_memory.py | 3 +- swh/storage/tests/test_replay.py | 435 +++++++++------------------------ swh/storage/tests/test_write_replay.py | 112 --------- 3 files changed, 120 insertions(+), 430 deletions(-) delete mode 100644 swh/storage/tests/test_write_replay.py
Changes applied before test
commit 5dbf3539dba6f6da356900413e0f3305a86159cb
Author: David Douard <david.douard@sdfa3.org>
Date: Fri May 29 14:28:31 2020 +0200
Replace MockedJournalClient and MockedKafkaWriter by proper kafka test scaffolding
This also kills test_write_replay.py file since it does not test anything
more than what is currently tested in test_replay.py.
commit eef4900db52a391e20ab51e36bace412ac6730d8
Author: David Douard <david.douard@sdfa3.org>
Date: Fri May 29 14:21:55 2020 +0200
Fix InMemoryStorage.origin_visit_upsert() method
the self._origin_visits[origin_url] list was built one element too big
(since visit ids starts from 1 and not 0).
This is needed to ease writing replayer tests (by comparing these lists).See https://jenkins.softwareheritage.org/job/DSTO/job/tests-on-diff/207/ for more details.
Comment Actions
This also kills test_write_replay.py file since it does not test anything
more than what is currently tested in test_replay.py.
Are you sure? replay.py seems to have only fixed examples, while test_write_replay.py uses anything hypothesis generates
Comment Actions
This aspect should be covered with the diff I am preparing in swh.journal, but yes, as is, your remark is true.
| swh/storage/tests/test_replay.py | ||
|---|---|---|
| 213 | Well this is a helper function for tests, it is not completely "dumb-proof", indeed, and I do not think we should complexify it for this purpose. | |
| swh/storage/tests/test_replay.py | ||
|---|---|---|
| 213 | sure | |
Comment Actions
Are you sure? replay.py seems to have only fixed examples, while
test_write_replay.py uses anything hypothesis generates
This aspect should be covered with the diff I am preparing in swh.journal,
but yes, as is, your remark is true.
D3207 started the work indeed. Looks fine to me.
Note that I like the hypothesis approach better though (data generation out of
the model mostly iirc) [1]
[1] I recall discussion whose lasting impression on the conclusion was, we are
not using hypothesis correctly. Aside from that, I don't recall much though
thus why i don't block anything ;)
| swh/storage/tests/test_write_replay.py | ||
|---|---|---|
| 48 | that's also a current ci build failure... [1] [1] https://jenkins.softwareheritage.org/job/DSTO/job/tests/1214/console | |
Comment Actions
Build has FAILED
Patch application report for D3203 (id=11415)
Could not rebase; Attempt merge onto eef4900db5...
Updating eef4900..727eed1 Fast-forward requirements-swh-journal.txt | 2 +- requirements-swh.txt | 2 +- swh/storage/cassandra/converters.py | 4 +- swh/storage/cassandra/storage.py | 2 +- swh/storage/tests/storage_data.py | 28 +- swh/storage/tests/test_api_client_dicts.py | 51 ---- swh/storage/tests/test_replay.py | 438 ++++++++--------------------- swh/storage/tests/test_storage.py | 17 +- swh/storage/tests/test_write_replay.py | 112 -------- swh/storage/validate.py | 25 +- 10 files changed, 174 insertions(+), 507 deletions(-) delete mode 100644 swh/storage/tests/test_api_client_dicts.py delete mode 100644 swh/storage/tests/test_write_replay.py
Changes applied before test
commit 727eed1109938a3366f06ac0c1c5a0426fbd014d
Author: David Douard <david.douard@sdfa3.org>
Date: Fri May 29 14:28:31 2020 +0200
Replace MockedJournalClient and MockedKafkaWriter by proper kafka test scaffolding
This also kills test_write_replay.py file since it does not test anything
more than what is currently tested in test_replay.py.
commit d1bcb9c638d671474c4d5b89d5eaa0869d177419
Author: David Douard <david.douard@sdfa3.org>
Date: Tue Jun 2 17:25:18 2020 +0200
Adapt to swh.model 0.3
in which List attributes have replaced by Tuple ones.
This requires a bit of adaptation in the code of the
ValidatingProxyStorage to ensure dict representation of revision
objects are properly typed.
The test_api_client_dicts.py has been removed since it's not really
useful any more and would require a fair amount of work to fix it.Link to build: https://jenkins.softwareheritage.org/job/DSTO/job/tests-on-diff/218/
See console output for more information: https://jenkins.softwareheritage.org/job/DSTO/job/tests-on-diff/218/console
Comment Actions
Build is green
Patch application report for D3203 (id=11420)
Could not rebase; Attempt merge onto eef4900db5...
Updating eef4900..f9b2ca3 Fast-forward requirements-swh-journal.txt | 2 +- requirements-swh.txt | 2 +- swh/storage/cassandra/converters.py | 4 +- swh/storage/cassandra/storage.py | 4 +- swh/storage/tests/storage_data.py | 28 +- swh/storage/tests/test_api_client_dicts.py | 51 ---- swh/storage/tests/test_replay.py | 438 ++++++++--------------------- swh/storage/tests/test_storage.py | 17 +- swh/storage/tests/test_write_replay.py | 112 -------- swh/storage/validate.py | 25 +- 10 files changed, 175 insertions(+), 508 deletions(-) delete mode 100644 swh/storage/tests/test_api_client_dicts.py delete mode 100644 swh/storage/tests/test_write_replay.py
Changes applied before test
commit f9b2ca3fec14853281ca7236741398e09b90e88e
Author: David Douard <david.douard@sdfa3.org>
Date: Fri May 29 14:28:31 2020 +0200
Replace MockedJournalClient and MockedKafkaWriter by proper kafka test scaffolding
This also kills test_write_replay.py file since it does not test anything
more than what is currently tested in test_replay.py.
commit ad9c9bbfd0d536217e895fd41408c8c11ceafc66
Author: David Douard <david.douard@sdfa3.org>
Date: Tue Jun 2 17:25:18 2020 +0200
Adapt to swh.model 0.3
in which List attributes have replaced by Tuple ones.
This requires a bit of adaptation in the code of the
ValidatingProxyStorage to ensure dict representation of revision
objects are properly typed.
The test_api_client_dicts.py has been removed since it's not really
useful any more and would require a fair amount of work to fix it.See https://jenkins.softwareheritage.org/job/DSTO/job/tests-on-diff/221/ for more details.