ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-26 08:01:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Get rid of temporary hacks.

Browse Source
This commit is contained in:
Itamar Turner-Trauring 2020-09-03 12:49:57 -04:00
parent f424c000de
commit 27f8ff9445
2 changed files with 50 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
.circleci/config.yml
View File

@ -6,51 +6,51 @@ workflows:
ci: ci:
jobs: jobs:
# Platforms # Platforms
# - "debian-9" - "debian-9"
# - "debian-8": - "debian-8":
# requires: requires:
# - "debian-9" - "debian-9"
# - "ubuntu-20.04" - "ubuntu-20.04"
# - "ubuntu-18.04": - "ubuntu-18.04":
# requires: requires:
# - "ubuntu-20.04" - "ubuntu-20.04"
# - "ubuntu-16.04": - "ubuntu-16.04":
# requires: requires:
# - "ubuntu-20.04" - "ubuntu-20.04"
# - "fedora-29" - "fedora-29"
# - "fedora-28": - "fedora-28":
# requires: requires:
# - "fedora-29" - "fedora-29"
# - "centos-8" - "centos-8"
# - "nixos-19.09" - "nixos-19.09"
# Test against PyPy 2.7 # Test against PyPy 2.7
- "pypy2.7-buster" - "pypy2.7-buster"
# Just one Python 3.6 configuration while the port is in-progress. # Just one Python 3.6 configuration while the port is in-progress.
# - "python3.6" - "python3.6"
# Other assorted tasks and configurations # Other assorted tasks and configurations
# - "lint" - "lint"
# - "pyinstaller" - "pyinstaller"
# - "deprecations" - "deprecations"
# - "c-locale" - "c-locale"
# Any locale other than C or UTF-8. # Any locale other than C or UTF-8.
# - "another-locale" - "another-locale"
# - "integration": - "integration":
# requires: requires:
# # If the unit test suite doesn't pass, don't bother running the # If the unit test suite doesn't pass, don't bother running the
# # integration tests. # integration tests.
# - "debian-9" - "debian-9"
# Generate the underlying data for a visualization to aid with Python 3 # Generate the underlying data for a visualization to aid with Python 3
# porting. # porting.
# - "build-porting-depgraph" - "build-porting-depgraph"
images: images:
# Build the Docker images used by the ci jobs. This makes the ci jobs # Build the Docker images used by the ci jobs. This makes the ci jobs

22
tox.ini
View File

@ -62,12 +62,32 @@ commands =
# Python 3.x yet. # Python 3.x yet.
!py36: tahoe --version !py36: tahoe --version
!coverage: trial {env:TAHOE_LAFS_TRIAL_ARGS:--rterrors} {posargs:{env:TEST_SUITE}}
# measuring coverage is somewhat slower than not measuring coverage
# so only do it on request.
coverage: coverage run -m twisted.trial {env:TAHOE_LAFS_TRIAL_ARGS:--rterrors --reporter=timing} {posargs:{env:TEST_SUITE}}
coverage: coverage combine
coverage: coverage xml
# This will only work on POSIX, but CI only runs it there
[test:pypy27-coverage]
commands =
# As an aid to debugging, dump all of the Python packages and their
# versions that are installed in the test environment. This is
# particularly useful to get from CI runs - though hopefully the
# version pinning we do limits the variability of this output
pip freeze
tahoe --version
!coverage: trial {env:TAHOE_LAFS_TRIAL_ARGS:--rterrors} allmydata.test.test_system !coverage: trial {env:TAHOE_LAFS_TRIAL_ARGS:--rterrors} allmydata.test.test_system
!coverage: env SKIP_TEST_SYSTEM=1 trial {env:TAHOE_LAFS_TRIAL_ARGS:--rterrors} {posargs:{env:TEST_SUITE}} !coverage: env SKIP_TEST_SYSTEM=1 trial {env:TAHOE_LAFS_TRIAL_ARGS:--rterrors} {posargs:{env:TEST_SUITE}}
# measuring coverage is somewhat slower than not measuring coverage # measuring coverage is somewhat slower than not measuring coverage
# so only do it on request. # so only do it on request.
coverage: coverage run -m twisted.trial {env:TAHOE_LAFS_TRIAL_ARGS:--rterrors --reporter=timing} {posargs:{env:TEST_SUITE}} coverage: coverage run -m twisted.trial {env:TAHOE_LAFS_TRIAL_ARGS:--rterrors --reporter=timing} allmydata.test.test_system
coverage: env SKIP_TEST_SYSTEM=1 coverage run -m twisted.trial {env:TAHOE_LAFS_TRIAL_ARGS:--rterrors --reporter=timing} {posargs:{env:TEST_SUITE}}
coverage: coverage combine coverage: coverage combine
coverage: coverage xml coverage: coverage xml