Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ticket33280 master #1731

Merged
merged 18 commits into from Feb 17, 2020
Merged

Conversation

Labels
None yet
Projects
None yet
4 participants
@teor2345
Copy link
Contributor

@teor2345 teor2345 commented Feb 13, 2020

No description provided.

teor2345 added 12 commits Feb 13, 2020
Add test-network-ipv4 and test-network-ipv6 tests to the Makefile.

These tests run the IPv4-only and dual-stack chutney flavours from
test-network-all.

Closes ticket 33280.
The IPv6 test only runs if IPv6 is available.

Also, explicitly use the bridges+hs-v2 network for the IPv4-only test.
This network was chutney's default as of January 2020.

Closes 33300.
Use bridges+hs-v23 for "make test-network",
rather than using chutney's old default.

This change requires a recent version of chutney,
because the old bridges+hs-v23 did not work.
(See chutney's 33302 for details.)

Closes 28208.
Run the test-network-ipv6 Makefile target in the Travis CI IPv6 chutney
job. This job runs on macOS, so it's a bit slow.

Closes ticket 33303.
The job was previously set to fast_finish / allow_failure, to
speed up the build.

Closes ticket 33195.
Putting the slowest jobs first takes full advantage of Travis
concurrency.

Closes 33194.
The job was previously set to fast_finish / allow_failure, to
speed up the build.

Closes ticket 33195.
Putting the slowest jobs first takes full advantage of Travis
concurrency.

Closes 33194.
Conflicts:
* Keep TOR_TEST_RNG_SEED from maint-0.4.1
* Keep the ordering from bug33195_035
Conflicts:
* Keep RUST_VERSION from maint-0.4.2
* Keep the commented-out allow_failure entries from bug33195_041
@coveralls
Copy link

@coveralls coveralls commented Feb 13, 2020

Pull Request Test Coverage Report for Build 8110

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage remained the same at 63.424%

Totals Coverage Status
Change from base Build 8104: 0.0%
Covered Lines: 50031
Relevant Lines: 78883

💛 - Coveralls

teor2345 added 2 commits Feb 13, 2020
Conflicts:
* Keep disable module relay from maint-0.4.3
* Keep doxygen from maint-0.4.3
* Keep the ordering from bug33195_042
src/test/include.am Show resolved Hide resolved
Makefile.am Outdated Show resolved Hide resolved
Makefile.am Outdated Show resolved Hide resolved
@teor2345 teor2345 force-pushed the ticket33280_master branch 3 times, most recently from 29750e6 to 0aba0b2 Feb 14, 2020
teor2345 added 4 commits Feb 17, 2020
Conflicts:
* Keep the changes from ticket33280_master
* Use a shorter name for the chutney make target
* Put the chutney make target first, when using a custom target

Part of 33280.
Also:
  * wrap some long lines
  * replace an instance of "test ... -a ..." with "test ... && test ..."

Part of 33280.
These logs break up the chutney test output.

Part of 33280.
@teor2345 teor2345 force-pushed the ticket33280_master branch from 3730f88 to 8874d1c Feb 17, 2020
@torproject-pusher torproject-pusher merged commit 8874d1c into torproject:master Feb 17, 2020
0 of 2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment