Page MenuHomeSoftware Heritage
Differential D1955

tests/test_storage: Fix tests execution with psycopg2 < 2.8
ClosedPublic
Actions

Authored by anlambert on Sep 4 2019, 2:37 PM.

Details

Reviewers
ardumont
Commits
rDSTOCf91671bdaa05: tests/test_storage: Remove failing assertion after swh-model update
rDSTOCddb8226c7e15: tests/test_storage: Fix tests execution with psycopg2 < 2.8
rDSTOf91671bdaa05: tests/test_storage: Remove failing assertion after swh-model update
rDSTOddb8226c7e15: tests/test_storage: Fix tests execution with psycopg2 < 2.8
Summary

This is another attempt to fix a psycopg2 related issue (see D1943).

psycopg2 introduced new exception types in its 2.8 version giving more details
about the encountered errors. These exceptions live in the newly added module psycopg2.errors.

Unfortunately, current Debian package python3-psycopg2 version is 2.7.7 on buster
and 2.6.2 on stretch. So this means Debian packaging and tests execution when not
using a virtualenv on Debian stable are currently broken for swh-storage.

Fortunately, the newly added exceptions in version 2.8 are derived from previously available ones for backward compatibility.

So use psycopg2 exceptions common to all module versions to ensure tests can be executed everywhere.

Diff Detail

Repository
rDSTO Storage manager
Branch
fix-psycopg2-exceptions-in-tests
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 7655
Build 10982: tox-on-jenkinsJenkins
Build 10981: arc lint + arc unit

Event Timeline

anlambert created this revision.Sep 4 2019, 2:37 PM
Harbormaster completed remote builds in B7648: Diff 6573.Sep 4 2019, 2:42 PM
swh-public-ci added a comment.Sep 4 2019, 2:42 PM

Build is green
See https://jenkins.softwareheritage.org/job/DSTO/job/tox/629/ for more details.

anlambert updated this revision to Diff 6576.Sep 4 2019, 2:43 PM

Update: Fix deprecation warning (assertRaisesRegexp -> assertRaisesRegex)

swh-public-ci added a comment.Sep 4 2019, 2:47 PM

Build is green
See https://jenkins.softwareheritage.org/job/DSTO/job/tox/630/ for more details.

Harbormaster completed remote builds in B7651: Diff 6576.Sep 4 2019, 2:47 PM
anlambert updated this revision to Diff 6580.Sep 4 2019, 3:13 PM

Update: also check Postgres error code to restore previous testing behavior

swh-public-ci added a comment.Sep 4 2019, 3:16 PM

Build has FAILED

Link to build: https://jenkins.softwareheritage.org/job/DSTO/job/tox/631/
See console output for more information: https://jenkins.softwareheritage.org/job/DSTO/job/tox/631/console

Harbormaster failed remote builds in B7655: Diff 6580!Sep 4 2019, 3:16 PM
ardumont accepted this revision.Sep 4 2019, 3:27 PM

Sounds good.

This revision is now accepted and ready to land.Sep 4 2019, 3:27 PM
swh-public-ci added a comment.Sep 4 2019, 3:31 PM

Build has FAILED

Link to build: https://jenkins.softwareheritage.org/job/DSTO/job/tox/632/
See console output for more information: https://jenkins.softwareheritage.org/job/DSTO/job/tox/632/console

swh-public-ci added a comment.Sep 4 2019, 3:39 PM

Build has FAILED

Link to build: https://jenkins.softwareheritage.org/job/DSTO/job/tox/633/
See console output for more information: https://jenkins.softwareheritage.org/job/DSTO/job/tox/633/console

ardumont added a comment.EditedSep 4 2019, 3:40 PM

See console output for more information: https://jenkins.softwareheritage.org/job/DSTO/job/tox/632/console

gotcha, it's not your code adaptations which raises the error.

swh-model got tagged (and debian built). That contains one constraint less on the origin's type (it can be null now). See D1953.

So that's why there is no longer an exception raised on the scenario which does not integrate the origin's type.

It made me raise an eyebrow as well ;)

anlambert updated this revision to Diff 6587.Sep 4 2019, 3:46 PM

Update: Remove failing assertion after swh-model update (not really the scope of that diff
so adding a new commit)

ardumont accepted this revision.Sep 4 2019, 3:47 PM
swh-public-ci added a comment.Sep 4 2019, 3:51 PM

Build is green
See https://jenkins.softwareheritage.org/job/DSTO/job/tox/634/ for more details.

Harbormaster completed remote builds in B7662: Diff 6587.Sep 4 2019, 3:51 PM
Closed by commit rDSTOddb8226c7e15: tests/test_storage: Fix tests execution with psycopg2 < 2.8 (authored by anlambert). · Explain WhySep 4 2019, 3:52 PM
This revision was automatically updated to reflect the committed changes.
anlambert added a commit: rDSTOCf91671bdaa05: tests/test_storage: Remove failing assertion after swh-model update.Oct 30 2019, 5:21 PM
anlambert added a commit: rDSTOCddb8226c7e15: tests/test_storage: Fix tests execution with psycopg2 < 2.8.

Revision Contents
Changeset List

PathSize
swh/
storage/
tests/
65 lines

Diff 6580

View Options

swh/storage/tests/test_storage.py

Loading...
About · Developer information · Legal