Merge branch 'master' into riseup_tests_improvements

.github/workflows/alltests.yml

@@ -1,6 +1,7 @@
 # Runs the whole test suite
 name: alltests
 on:
+  pull_request:
   push:
     branches:
       - "release/**"

.github/workflows/coverage.yml

@@ -24,7 +24,7 @@ jobs:
           go-version: "${{ steps.goversion.outputs.version }}"
           cache-key-suffix: "-coverage-${{ steps.goversion.outputs.version }}"
 
-      - run: go test -short -race -tags shaping -coverprofile=probe-cli.cov ./...
+      - run: ./script/linuxcoverage.bash
 
       - uses: shogo82148/actions-goveralls@v1
         with:

.github/workflows/libtorlinux.yml

@@ -1,7 +1,6 @@
 # Runs tests for internal/libtor with -tags=ooni_libtor
 name: libtorlinux
 on:
-  pull_request:
   push:
     branches:
       - "master"

.gitignore

@@ -16,7 +16,6 @@
 /citizenlab-test-lists
 /gardener
 /ghpublish.out.txt
-/jafar
 /libooniengine.*
 /measurement.json
 /miniooni
@@ -25,4 +24,5 @@
 /ooniprobe
 /ooporthelper
 /probe-cli.cov
+/tinyjafar
 /tmp-*

CDEPS/openssl/001.patch

@@ -1,14 +1,15 @@
-diff --git a/include/openssl/opensslv.h b/include/openssl/opensslv.h
-index fd9400a..0d2c9dc 100644
---- a/include/openssl/opensslv.h
-+++ b/include/openssl/opensslv.h
-@@ -94,6 +94,9 @@ extern "C" {
- # define SHLIB_VERSION_HISTORY ""
- # define SHLIB_VERSION_NUMBER "1.1"
-
+diff --git a/include/openssl/opensslv.h.in b/include/openssl/opensslv.h.in
+index 3f47a2a..af1db51 100644
+--- a/include/openssl/opensslv.h.in
++++ b/include/openssl/opensslv.h.in
+@@ -101,6 +101,10 @@ extern "C" {
+       |(OPENSSL_VERSION_PATCH<<4)        \
+       |_OPENSSL_VERSION_PRE_RELEASE )
+ 
 +/* OPENSSL_OONI is used by dependencies to ensure they are using the
 +   correct OpenSSL headers and not some other headers. */
 +#define OPENSSL_OONI 1
-
- #ifdef  __cplusplus
++
+ # ifdef  __cplusplus
  }
+ # endif

CONTRIBUTING.md

@@ -36,11 +36,26 @@ functionality should pass existing tests. What's more, any new pull
 request that modifies existing functionality should not decrease the
 existing code coverage.
 
-Long-running tests should be skipped when running tests in short mode
-using `go test -short`. We prefer internal testing to external
-testing. We generally have a file called `foo_test.go` with tests
-for every `foo.go` file. Sometimes we separate long running
-integration tests in a `foo_integration_test.go` file.
+New code should have full coverage using either localhost or the
+[internal/netemx](./internal/netemx/) package. Try to cover all the
+error paths as well as the important properties of the code you've written
+that you would like to be sure about.
+
+Additional integration tests using the host network are good,
+but they MUST use this pattern:
+
+```Go
+func TestUsingHostNetwork(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skip test in short mode")
+	}
+}
+```
+
+The overall objective here is for `go test -short` to only use localhost
+and [internal/netemx](./internal/netemx/) such that tests are always
+reproducible. Tests using the host network are there to give us extra
+confidence that everything is working as intended.
 
 If there is a top-level DESIGN.md document, make sure such document is
 kept in sync with code changes you have applied.
@@ -88,10 +103,9 @@ will understand you want to use the default pool)
 ## Code testing requirements
 
 Make sure all tests pass with `go test -race ./...` run from the
-top-level directory of this repository. (Integration tests may be
-flaky, so there may be some failures here and and there; we know
-in particular that `./internal/cmd/jafar` is one of the usual
-suspects and that it's not super pleasant to test it under Linux.)
+top-level directory of this repository. (Running [netem](
+https://github.com/ooni/netem) based tests may not work as intended
+with `-race` with macOS.)
 
 ## Writing a new OONI experiment
 

GOVERSION

@@ -1 +1 @@
-1.20.6
+1.20.8

NDKVERSION

@@ -1 +1 @@
-25.2.9519653
+26.0.10792818