Changeset abb0379 in trunk

Timestamp:

2022-10-03T16:32:28Z (3 years ago)

Author:

GitHub <noreply@…>

Branches:

master

Children:

37589e3, f56b434

Parents:

9f01d4f (diff), 795ec0b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Itamar Turner-Trauring <itamar@…> (2022-10-03 16:32:28)

git-committer:

GitHub <noreply@…> (2022-10-03 16:32:28)

Message:

Merge pull request #1223 from tahoe-lafs/3928-i2p

Fix i2p integration tests

Fixes ticket:3928

Files:

• integration/test_i2p.py (modified) (2 diffs)
• newsfragments/3928.minor (added)
• setup.py (modified) (1 diff)

integration/test_i2p.py ¶

@@ -56 +56 @@
         which("docker"),
         (
-            "docker", "run", "-p", "7656:7656", "purplei2p/i2pd",
+            "docker", "run", "-p", "7656:7656", "purplei2p/i2pd:release-2.43.0",
             # Bad URL for reseeds, so it can't talk to other routers.
             "--reseed.urls", "http://localhost:1/",
@@ -64 +64 @@
     def cleanup():
         try:
-            proto.transport.signalProcess("KILL")
+            proto.transport.signalProcess("INT")
             util.block_with_timeout(proto.exited, reactor)
         except ProcessExitedAlready:

setup.py ¶

@@ -387 +387 @@
           "test": [
               "flake8",
+              # On Python 3.7, importlib_metadata v5 breaks flake8.
+              # https://github.com/python/importlib_metadata/issues/407
+              "importlib_metadata<5; python_version < '3.8'",
               # Pin a specific pyflakes so we don't have different folks
               # disagreeing on what is or is not a lint issue.  We can bump