Page MenuHomeSoftware Heritage
Differential D7817

Add first set of functional tests
ClosedPublic
Actions

Authored by jayeshv on May 12 2022, 11:51 AM.

Details

Reviewers
anlambert
Group Reviewers
Reviewers
Commits
rDGQL34095c065153: Add first set of functional tests
Summary
  • Mock storage and dev server
  • Dummy storage data
  • Functional tests for OriginNode and OriginConnection

Diff Detail

Repository
rDGQL GraphQL API
Branch
origin-tests
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 29406
Build 45956: Phabricator diff pipeline on jenkinsJenkins console · Jenkins
Build 45955: arc lint + arc unit

Event Timeline

jayeshv created this revision.May 12 2022, 11:51 AM
Herald added a reviewer: Reviewers. · View Herald TranscriptMay 12 2022, 11:51 AM
swh-public-ci added a comment.May 12 2022, 11:52 AM

Build has FAILED

Patch application report for D7817 (id=28228)

Rebasing onto e43cde0cb4...

Current branch diff-target is up to date.
Changes applied before test
commit 7de3ce4168829db5a27030cf6955813c5874daad
Author: Jayesh Velayudhan <jayesh@softwareheritage.org>
Date:   Wed May 11 10:51:12 2022 +0200

    Add first set of functional tests
    
    - Mock storage and dev server
    - Dummy storage data
    - Functional tests for OriginNode and OriginConnection

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

Harbormaster returned this revision to the author for changes because remote builds failed.May 12 2022, 11:52 AM
Harbormaster failed remote builds in B29335: Diff 28228!
jayeshv updated this revision to Diff 28230.May 12 2022, 12:22 PM

Remove pytz dependency

swh-public-ci added a comment.May 12 2022, 12:23 PM

Build has FAILED

Patch application report for D7817 (id=28230)

Rebasing onto e43cde0cb4...

Current branch diff-target is up to date.
Changes applied before test
commit 7dda8e52dcc58b3a1f1e5b0b9a5856cf5edc200b
Author: Jayesh Velayudhan <jayesh@softwareheritage.org>
Date:   Wed May 11 10:51:12 2022 +0200

    Add first set of functional tests
    
    - Mock storage and dev server
    - Dummy storage data
    - Functional tests for OriginNode and OriginConnection

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

Harbormaster returned this revision to the author for changes because remote builds failed.May 12 2022, 12:23 PM
Harbormaster failed remote builds in B29337: Diff 28230!
jayeshv updated this revision to Diff 28231.May 12 2022, 12:26 PM

Add requests to mypy.ini ignore imports

swh-public-ci added a comment.May 12 2022, 12:28 PM

Build has FAILED

Patch application report for D7817 (id=28231)

Rebasing onto e43cde0cb4...

Current branch diff-target is up to date.
Changes applied before test
commit e5409ed13e12642dc9d2cc805c19933fd326ca75
Author: Jayesh Velayudhan <jayesh@softwareheritage.org>
Date:   Wed May 11 10:51:12 2022 +0200

    Add first set of functional tests
    
    - Mock storage and dev server
    - Dummy storage data
    - Functional tests for OriginNode and OriginConnection

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

Harbormaster returned this revision to the author for changes because remote builds failed.May 12 2022, 12:28 PM
Harbormaster failed remote builds in B29338: Diff 28231!
jayeshv updated this revision to Diff 28232.May 12 2022, 12:30 PM

Increase the time delay to start the test server

swh-public-ci added a comment.May 12 2022, 12:33 PM

Build has FAILED

Patch application report for D7817 (id=28232)

Rebasing onto e43cde0cb4...

Current branch diff-target is up to date.
Changes applied before test
commit 780e0d7e834f07f4670b0248d188a9e4d619732b
Author: Jayesh Velayudhan <jayesh@softwareheritage.org>
Date:   Wed May 11 10:51:12 2022 +0200

    Add first set of functional tests
    
    - Mock storage and dev server
    - Dummy storage data
    - Functional tests for OriginNode and OriginConnection

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

Harbormaster returned this revision to the author for changes because remote builds failed.May 12 2022, 12:33 PM
Harbormaster failed remote builds in B29339: Diff 28232!
jayeshv updated this revision to Diff 28233.May 12 2022, 12:41 PM

Change the URL to localhost

swh-public-ci added a comment.May 12 2022, 12:43 PM

Build has FAILED

Patch application report for D7817 (id=28233)

Rebasing onto e43cde0cb4...

Current branch diff-target is up to date.
Changes applied before test
commit 6ed56b9b24c5279a7e7512ede416d8222268fbcc
Author: Jayesh Velayudhan <jayesh@softwareheritage.org>
Date:   Wed May 11 10:51:12 2022 +0200

    Add first set of functional tests
    
    - Mock storage and dev server
    - Dummy storage data
    - Functional tests for OriginNode and OriginConnection

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

Harbormaster returned this revision to the author for changes because remote builds failed.May 12 2022, 12:43 PM
Harbormaster failed remote builds in B29340: Diff 28233!
jayeshv updated this revision to Diff 28262.May 13 2022, 10:24 AM

Tests for filtering origin with URL

swh-public-ci added a comment.May 13 2022, 10:26 AM

Build has FAILED

Patch application report for D7817 (id=28262)

Rebasing onto e43cde0cb4...

Current branch diff-target is up to date.
Changes applied before test
commit d664beb1949c5e052cff4399d5142458d5c55b11
Author: Jayesh Velayudhan <jayesh@softwareheritage.org>
Date:   Wed May 11 10:51:12 2022 +0200

    Add first set of functional tests
    
    - Mock storage and dev server
    - Dummy storage data
    - Functional tests for OriginNode and OriginConnection

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

Harbormaster returned this revision to the author for changes because remote builds failed.May 13 2022, 10:26 AM
Harbormaster failed remote builds in B29367: Diff 28262!
jayeshv updated this revision to Diff 28303.May 16 2022, 3:04 PM

Replace the dummy uvicorn server with the flask

swh-public-ci added a comment.May 16 2022, 3:07 PM

Build is green

Patch application report for D7817 (id=28303)

Rebasing onto 2736e5f3dd...

Current branch diff-target is up to date.
Changes applied before test
commit 93d8b83a48c65f6abec8942ecae53bb6df70fff3
Author: Jayesh Velayudhan <jayesh@softwareheritage.org>
Date:   Wed May 11 10:51:12 2022 +0200

    Add first set of functional tests
    
    - Mock storage and dummy flask app for tests
    - Separate config file for tests
    - Dummy storage data for origin type
    - Functional tests for OriginNode and OriginConnection

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

Harbormaster completed remote builds in B29405: Diff 28303.May 16 2022, 3:07 PM
jayeshv requested review of this revision.May 16 2022, 3:07 PM
jayeshv updated this revision to Diff 28304.May 16 2022, 3:07 PM

Removed unused libs from mypy config

swh-public-ci added a comment.May 16 2022, 3:09 PM

Build is green

Patch application report for D7817 (id=28304)

Rebasing onto 2736e5f3dd...

Current branch diff-target is up to date.
Changes applied before test
commit 39ea7626af89812dd317b50368c05709867e4650
Author: Jayesh Velayudhan <jayesh@softwareheritage.org>
Date:   Wed May 11 10:51:12 2022 +0200

    Add first set of functional tests
    
    - Mock storage and dummy flask app for tests
    - Separate config file for tests
    - Dummy storage data for origin type
    - Functional tests for OriginNode and OriginConnection

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

Harbormaster completed remote builds in B29406: Diff 28304.May 16 2022, 3:09 PM
anlambert requested changes to this revision.May 16 2022, 3:37 PM
anlambert added a subscriber: anlambert.
anlambert added inline comments.
swh/graphql/server.py
79

s/falsk/flask/

79–97

If this only used by test, you should move this code in conftest.py and wraps it in a session scope fixture.

swh/graphql/tests/conftest.py
7

You should not import stuffs from private modules, we already have some issues because of that in the past.

30

Use pytest-mock instead, this should translate to:

@pytest.fixture(scope="session")
def storage(mocker):
    def mock_storage(*args, **kw):
        storage = get_swhstorage(cls="memory")
        populate_dummy_data(storage)
        return storage

    mocker.patch.object(app_server, "get_storage", mock_storage)
swh/graphql/tests/functional/test_origin.py
9

You can gain one indentation level by removing the class and writing only functions for the tests.

Something like:

def test_origin_connection_get(client):
   ...

def test_origin_connection_get_filter_by_pattern(client):
  ...

...
swh/graphql/tests/functional/utils.py
11

If the status code is not 200 and there is some error message in the response, you should extract it and display it if the assertions fails.
It should help to debug tests.

error_message = (extract it from response if available)
assert response.status_code == 200, error_message
This revision now requires changes to proceed.May 16 2022, 3:37 PM
anlambert added inline comments.May 17 2022, 10:59 AM
swh/graphql/tests/conftest.py
30

Ok got it, you were forced to proceed like this because of the session scope.

I think you can use function scope fixture (the default) directly then, based on my
tests this does not affect tests performance and this will guarantee that each test
is executed with the same input data in you test archive.

This way you can directly use the monkeypatch fixture.

jayeshv updated this revision to Diff 28344.May 18 2022, 11:59 AM

addressing review comments

jayeshv marked 6 inline comments as done.May 18 2022, 12:01 PM
jayeshv added inline comments.
swh/graphql/tests/conftest.py
30

Removed this mock, setting the global variable directly from conftest.

swh-public-ci added a comment.May 18 2022, 12:02 PM

Build has FAILED

Patch application report for D7817 (id=28344)

Rebasing onto 2736e5f3dd...

Current branch diff-target is up to date.
Changes applied before test
commit 1e07b31877cea885c804548a49b6c4cd7a0848e6
Author: Jayesh Velayudhan <jayesh@softwareheritage.org>
Date:   Wed May 11 10:51:12 2022 +0200

    Add first set of functional tests
    
    - in-memory storage and dummy flask app for tests
    - Dummy storage data to test origin type
    - Functional tests for OriginNode and OriginConnection

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

Harbormaster failed remote builds in B29447: Diff 28344!May 18 2022, 12:02 PM
jayeshv updated this revision to Diff 28345.May 18 2022, 12:26 PM
jayeshv marked an inline comment as done.

Changed import order

swh-public-ci added a comment.May 18 2022, 12:29 PM

Build is green

Patch application report for D7817 (id=28345)

Rebasing onto 2736e5f3dd...

Current branch diff-target is up to date.
Changes applied before test
commit 34095c065153cd24d35be41c54fcc30d8f3d12a9
Author: Jayesh Velayudhan <jayesh@softwareheritage.org>
Date:   Wed May 11 10:51:12 2022 +0200

    Add first set of functional tests
    
    - in-memory storage and dummy flask app for tests
    - Dummy storage data to test origin type
    - Functional tests for OriginNode and OriginConnection

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

Harbormaster completed remote builds in B29448: Diff 28345.May 18 2022, 12:29 PM
anlambert accepted this revision.May 18 2022, 4:56 PM

Looks good to me.

This revision is now accepted and ready to land.May 18 2022, 4:56 PM
Closed by commit rDGQL34095c065153: Add first set of functional tests (authored by jayeshv). · Explain WhyMay 18 2022, 4:59 PM
This revision was automatically updated to reflect the committed changes.
jayeshv added a commit: rDGQL34095c065153: Add first set of functional tests.

Revision Contents
Changeset List

PathSizeCoverage (All)Coverage (Touched)
config/
6 lines--
1 line--
swh/
graphql/
resolvers/
5 lines100%
Loading...
32 lines73%
Loading...
tests/
37 lines100%
Loading...
105 lines100%
Loading...
functional/
97 lines100%
Loading...
13 lines100%
Loading...

Diff 28304

View Options

config/test.yml

Loading...
View Options

mypy.ini

Loading...
View Options

swh/graphql/resolvers/origin.py

Loading...
View Options

swh/graphql/server.py

Loading...
View Options

swh/graphql/tests/conftest.py

Loading...
View Options

swh/graphql/tests/data.py

Loading...
View Options

swh/graphql/tests/functional/test_origin.py

Loading...
View Options

swh/graphql/tests/functional/utils.py

Loading...
About · Developer information · Legal