Details

Reviewers

douardda

Group Reviewers

Reviewers

Commits

rDSEA225ad532ebeb: Fix search journal client tests

Summary

This:

tests: drop the now broken MockedKafkaConsumer test class
migrate the journal client test to pytest (it would not accept to inject fixtures otherwise)
fixes the ci [1]

[1] https://jenkins.softwareheritage.org/job/DSEA/job/tests/266/console

Related to D3144

Test Plan

tox

Diff Detail

Repository

rDSEA Archive search

Branch

master

Lint

No Linters Available

Unit

No Unit Test Coverage

Build Status

Buildable 12363
Build 18751: Phabricator diff pipeline on jenkins	Jenkins console · Jenkins
Build 18750: arc lint + arc unit

Unit TestsFailed
View All

	Time	Test
	1,615 ms	Jenkins > .tox.py3.lib.python3.7.site-packages.swh.search.tests.test_cli::test__journal_client__origin swh_search = <swh.search.elasticsearch.ElasticSearch object at 0x7f969175ebe0> elasticsearch_host = '127.0.0.1:42967', kafka_prefix = 'ohmpavtyjz' kafka_server = '127.0.0.1:45115'
	17,903 ms	Jenkins > .tox.py3.lib.python3.7.site-packages.swh.search.tests.test_api_client.TestRemoteSearch::test_origin_intrinsic_metadata_all_terms
	537 ms	Jenkins > .tox.py3.lib.python3.7.site-packages.swh.search.tests.test_api_client.TestRemoteSearch::test_origin_intrinsic_metadata_description
	495 ms	Jenkins > .tox.py3.lib.python3.7.site-packages.swh.search.tests.test_api_client.TestRemoteSearch::test_origin_intrinsic_metadata_nested
	1,973 ms	Jenkins > .tox.py3.lib.python3.7.site-packages.swh.search.tests.test_api_client.TestRemoteSearch::test_origin_intrinsic_metadata_paging
		View Full Test Results (1 Failed · 31 Passed · 5 Skipped)

Event Timeline

ardumont created this revision.May 13 2020, 2:42 PM

ardumont edited the test plan for this revision. (Show Details)May 13 2020, 2:43 PM

ardumont added projects: Archive search, Journal.

Build has FAILED

Patch application report for D3151 (id=11181)

Rebasing onto 4dbcbc4e7d...

Current branch diff-target is up to date.

Changes applied before test

commit 603fb64cd7b548243220fd3938fd28a204385465
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Wed May 13 13:48:01 2020 +0200

    Fix search journal client tests
    
    This:
    - tests: drop the now broken MockedKafkaConsumer test class.
    - migrate the journal client test to pytest
    - fixes the ci [1]
    
    [1] https://jenkins.softwareheritage.org/job/DSEA/job/tests/266/console

Link to build: https://jenkins.softwareheritage.org/job/DSEA/job/tests-on-diff/7/
See console output for more information: https://jenkins.softwareheritage.org/job/DSEA/job/tests-on-diff/7/console

Harbormaster failed remote builds in B12363: Diff 11181!May 13 2020, 2:44 PM

Keep initial assertions order

Build has FAILED

Patch application report for D3151 (id=11182)

Rebasing onto 4dbcbc4e7d...

Current branch diff-target is up to date.

Changes applied before test

commit 68ea36fdecba37375fdabf0aa1c5d12414022b08
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Wed May 13 13:48:01 2020 +0200

    Fix search journal client tests
    
    This:
    - tests: drop the now broken MockedKafkaConsumer test class.
    - migrate the journal client test to pytest
    - fixes the ci [1]
    
    [1] https://jenkins.softwareheritage.org/job/DSEA/job/tests/266/console

Link to build: https://jenkins.softwareheritage.org/job/DSEA/job/tests-on-diff/8/
See console output for more information: https://jenkins.softwareheritage.org/job/DSEA/job/tests-on-diff/8/console

Harbormaster failed remote builds in B12364: Diff 11182!May 13 2020, 2:50 PM

Fix tests (in the end, reset issue)

ardumont edited the test plan for this revision. (Show Details)May 13 2020, 2:59 PM

Build is green

Patch application report for D3151 (id=11183)

Rebasing onto 4dbcbc4e7d...

Current branch diff-target is up to date.

Changes applied before test

commit 89b47c37d07540e587336c1a820cb129420fdbd6
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Wed May 13 13:48:01 2020 +0200

    Fix search journal client tests
    
    This:
    - tests: drop the now broken MockedKafkaConsumer test class.
    - migrate the journal client test to pytest
    - fixes the ci [1]
    
    [1] https://jenkins.softwareheritage.org/job/DSEA/job/tests/266/console

See https://jenkins.softwareheritage.org/job/DSEA/job/tests-on-diff/9/ for more details.

Harbormaster completed remote builds in B12365: Diff 11183.May 13 2020, 3:01 PM

ardumont edited the summary of this revision. (Show Details)May 13 2020, 3:04 PM

ardumont edited the summary of this revision. (Show Details)May 13 2020, 3:08 PM

Drop no longer required setUp method
Specify the deinitialize/initialize in comments

Build is green

Patch application report for D3151 (id=11184)

Rebasing onto 4dbcbc4e7d...

Current branch diff-target is up to date.

Changes applied before test

commit 5589f9d0e04938008d5acbeb9231c0e91acd335b
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Wed May 13 13:48:01 2020 +0200

    Fix search journal client tests
    
    This:
    - tests: drop the now broken MockedKafkaConsumer test class.
    - migrate the journal client test to pytest
    - fixes the ci [1]
    
    [1] https://jenkins.softwareheritage.org/job/DSEA/job/tests/266/console

See https://jenkins.softwareheritage.org/job/DSEA/job/tests-on-diff/10/ for more details.

Harbormaster completed remote builds in B12366: Diff 11184.May 13 2020, 3:30 PM

ardumont mentioned this in D3147: README: Update necessary dependencies for test purposes.May 13 2020, 3:31 PM

douardda added inline comments.May 13 2020, 3:50 PM

swh/search/tests/test_cli.py
36	why this hardcoded IP for the broker?

ardumont added inline comments.May 13 2020, 3:54 PM

swh/search/tests/test_cli.py
36	Maybe because it was mock before. This one is really used by the last tests in this test file, the ones with failure. So i guess, it's not that important. What matters is that the stucture of the configuration file is ok enough for the tests to kick in.

vlorentz added a subscriber: vlorentz.May 13 2020, 3:54 PM

vlorentz added inline comments.

swh/search/tests/test_cli.py
36	because it needs to be set to something.
36	Plus, it's in the TEST-NET-1 range, so there's really no harm in it

douardda accepted this revision.May 13 2020, 4:02 PM

douardda added inline comments.

swh/search/tests/test_cli.py
36	we are nitpicking, sure, but since this global var is used in one test only, I see no reason to keep it as a global var. It's at best confusing, even if harmless, as you stated below. Harmless for the computer, not for the human reading / maintaining the code IMHO.

This revision is now accepted and ready to land.May 13 2020, 4:02 PM

ardumont added inline comments.May 13 2020, 4:05 PM

swh/search/tests/test_cli.py
36	ah yes, it's only used once now. It was used everywhere before. I missed it.

Remove global var and put that definition local to its use

In D3151#76517, @ardumont wrote:

Remove global var and put that definition local to its use

Thx

Build is green

Patch application report for D3151 (id=11185)

Rebasing onto 4dbcbc4e7d...

Current branch diff-target is up to date.

Changes applied before test

commit 225ad532ebeba78791644b0a9e79f2286ca0c46c
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Wed May 13 13:48:01 2020 +0200

    Fix search journal client tests
    
    This:
    - tests: drop the now broken MockedKafkaConsumer test class.
    - migrate the journal client test to pytest
    - fixes the ci [1]
    
    [1] https://jenkins.softwareheritage.org/job/DSEA/job/tests/266/console

See https://jenkins.softwareheritage.org/job/DSEA/job/tests-on-diff/11/ for more details.

Harbormaster completed remote builds in B12367: Diff 11185.May 13 2020, 4:07 PM

Closed by commit rDSEA225ad532ebeb: Fix search journal client tests (authored by ardumont). · Explain WhyMay 13 2020, 4:08 PM

This revision was automatically updated to reflect the committed changes.

ardumont added a commit: rDSEA225ad532ebeb: Fix search journal client tests.

(fix ci) Fix search journal client tests
ClosedPublic
Actions

Details

Diff Detail

Unit TestsFailed
View All

Event Timeline

Patch application report for D3151 (id=11181)

Changes applied before test

Patch application report for D3151 (id=11182)

Changes applied before test

Patch application report for D3151 (id=11183)

Changes applied before test

Patch application report for D3151 (id=11184)

Changes applied before test

Patch application report for D3151 (id=11185)

Changes applied before test

Revision Contents
Changeset List

Diff 11181

mypy.ini

requirements-swh.txt

requirements-test.txt

swh/search/tests/conftest.py

swh/search/tests/test_cli.py

(fix ci) Fix search journal client testsClosedPublicActions

Details

Diff Detail

Unit TestsFailedView All

Event Timeline

Patch application report for D3151 (id=11181)

Changes applied before test

Patch application report for D3151 (id=11182)

Changes applied before test

Patch application report for D3151 (id=11183)

Changes applied before test

Patch application report for D3151 (id=11184)

Changes applied before test

Patch application report for D3151 (id=11185)

Changes applied before test

Revision ContentsChangeset List

Diff 11181

mypy.ini

requirements-swh.txt

requirements-test.txt

swh/search/tests/conftest.py

swh/search/tests/test_cli.py

(fix ci) Fix search journal client tests
ClosedPublic
Actions

Unit TestsFailed
View All

Revision Contents
Changeset List