diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9082d218c5..5f5d655efa 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,7 +10,7 @@ env: # Otherwise, set variable to the commit of your branch on # opentelemetry-python-contrib which is compatible with these Core repo # changes. - CONTRIB_REPO_SHA: a7f34e8c5f5909500dcca44f823d72d55aacd59e + CONTRIB_REPO_SHA: 3bae87057ddb166490c7b43f4587b408a565d8bc # This is needed because we do not clone the core repo in contrib builds anymore. # When running contrib builds as part of core builds, we use actions/checkout@v2 which # does not set an environment variable (simply just runs tox), which is different when diff --git a/eachdist.ini b/eachdist.ini index 7da4c4c1ba..0164439dc1 100644 --- a/eachdist.ini +++ b/eachdist.ini @@ -7,7 +7,7 @@ sortfirst= opentelemetry-sdk opentelemetry-proto opentelemetry-distro - tests/opentelemetry-test + tests/opentelemetry-test-utils exporter/* [stable] @@ -37,7 +37,7 @@ packages= opentelemetry-exporter-opencensus opentelemetry-distro opentelemetry-semantic-conventions - opentelemetry-test + opentelemetry-test-utils tests [experimental] diff --git a/scripts/build.sh b/scripts/build.sh index f317b840a0..605884bee6 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -16,7 +16,7 @@ DISTDIR=dist mkdir -p $DISTDIR rm -rf $DISTDIR/* - for d in opentelemetry-api/ opentelemetry-sdk/ opentelemetry-proto/ opentelemetry-semantic-conventions/ exporter/*/ shim/*/ propagator/*/ tests/opentelemetry-test/; do + for d in opentelemetry-api/ opentelemetry-sdk/ opentelemetry-proto/ opentelemetry-semantic-conventions/ exporter/*/ shim/*/ propagator/*/ tests/opentelemetry-test-utils/; do ( echo "building $d" cd "$d" diff --git a/shim/opentelemetry-opentracing-shim/setup.cfg b/shim/opentelemetry-opentracing-shim/setup.cfg index 95e5d99a46..5574b9d037 100644 --- a/shim/opentelemetry-opentracing-shim/setup.cfg +++ b/shim/opentelemetry-opentracing-shim/setup.cfg @@ -47,7 +47,7 @@ install_requires = [options.extras_require] test = - opentelemetry-test == 0.26b0 + opentelemetry-test-utils == 0.26b0 opentracing ~= 2.2.0 [options.packages.find] diff --git a/tests/opentelemetry-test/README.rst b/tests/opentelemetry-test-utils/README.rst similarity index 100% rename from tests/opentelemetry-test/README.rst rename to tests/opentelemetry-test-utils/README.rst diff --git a/tests/opentelemetry-test/setup.cfg b/tests/opentelemetry-test-utils/setup.cfg similarity index 96% rename from tests/opentelemetry-test/setup.cfg rename to tests/opentelemetry-test-utils/setup.cfg index 591b787ada..cf5220fc3b 100644 --- a/tests/opentelemetry-test/setup.cfg +++ b/tests/opentelemetry-test-utils/setup.cfg @@ -13,11 +13,11 @@ # limitations under the License. [metadata] -name = opentelemetry-test +name = opentelemetry-test-utils description = Test utilities for OpenTelemetry unit tests author = OpenTelemetry Authors author_email = cncf-opentelemetry-contributors@lists.cncf.io -url = https://github.com/open-telemetry/opentelemetry-python/tests/opentelemetry-test +url = https://github.com/open-telemetry/opentelemetry-python/tests/opentelemetry-test-utils platforms = any license = Apache-2.0 classifiers = diff --git a/tests/opentelemetry-test/setup.py b/tests/opentelemetry-test-utils/setup.py similarity index 100% rename from tests/opentelemetry-test/setup.py rename to tests/opentelemetry-test-utils/setup.py diff --git a/tests/opentelemetry-test/src/opentelemetry/test/asgitestutil.py b/tests/opentelemetry-test-utils/src/opentelemetry/test/asgitestutil.py similarity index 100% rename from tests/opentelemetry-test/src/opentelemetry/test/asgitestutil.py rename to tests/opentelemetry-test-utils/src/opentelemetry/test/asgitestutil.py diff --git a/tests/opentelemetry-test/src/opentelemetry/test/concurrency_test.py b/tests/opentelemetry-test-utils/src/opentelemetry/test/concurrency_test.py similarity index 100% rename from tests/opentelemetry-test/src/opentelemetry/test/concurrency_test.py rename to tests/opentelemetry-test-utils/src/opentelemetry/test/concurrency_test.py diff --git a/tests/opentelemetry-test/src/opentelemetry/test/globals_test.py b/tests/opentelemetry-test-utils/src/opentelemetry/test/globals_test.py similarity index 100% rename from tests/opentelemetry-test/src/opentelemetry/test/globals_test.py rename to tests/opentelemetry-test-utils/src/opentelemetry/test/globals_test.py diff --git a/tests/opentelemetry-test/src/opentelemetry/test/httptest.py b/tests/opentelemetry-test-utils/src/opentelemetry/test/httptest.py similarity index 100% rename from tests/opentelemetry-test/src/opentelemetry/test/httptest.py rename to tests/opentelemetry-test-utils/src/opentelemetry/test/httptest.py diff --git a/tests/opentelemetry-test/src/opentelemetry/test/mock_textmap.py b/tests/opentelemetry-test-utils/src/opentelemetry/test/mock_textmap.py similarity index 100% rename from tests/opentelemetry-test/src/opentelemetry/test/mock_textmap.py rename to tests/opentelemetry-test-utils/src/opentelemetry/test/mock_textmap.py diff --git a/tests/opentelemetry-test/src/opentelemetry/test/spantestutil.py b/tests/opentelemetry-test-utils/src/opentelemetry/test/spantestutil.py similarity index 100% rename from tests/opentelemetry-test/src/opentelemetry/test/spantestutil.py rename to tests/opentelemetry-test-utils/src/opentelemetry/test/spantestutil.py diff --git a/tests/opentelemetry-test/src/opentelemetry/test/test_base.py b/tests/opentelemetry-test-utils/src/opentelemetry/test/test_base.py similarity index 100% rename from tests/opentelemetry-test/src/opentelemetry/test/test_base.py rename to tests/opentelemetry-test-utils/src/opentelemetry/test/test_base.py diff --git a/tests/opentelemetry-test/src/opentelemetry/test/version.py b/tests/opentelemetry-test-utils/src/opentelemetry/test/version.py similarity index 100% rename from tests/opentelemetry-test/src/opentelemetry/test/version.py rename to tests/opentelemetry-test-utils/src/opentelemetry/test/version.py diff --git a/tests/opentelemetry-test/src/opentelemetry/test/wsgitestutil.py b/tests/opentelemetry-test-utils/src/opentelemetry/test/wsgitestutil.py similarity index 100% rename from tests/opentelemetry-test/src/opentelemetry/test/wsgitestutil.py rename to tests/opentelemetry-test-utils/src/opentelemetry/test/wsgitestutil.py diff --git a/tox.ini b/tox.ini index a0632c8387..2999b7fe43 100644 --- a/tox.ini +++ b/tox.ini @@ -79,7 +79,7 @@ setenv = ; i.e: CONTRIB_REPO_SHA=dde62cebffe519c35875af6d06fae053b3be65ec tox -e CONTRIB_REPO_SHA={env:CONTRIB_REPO_SHA:"main"} CONTRIB_REPO="git+https://github.com/open-telemetry/opentelemetry-python-contrib.git@{env:CONTRIB_REPO_SHA}" - mypy: MYPYPATH={toxinidir}/opentelemetry-api/src/:{toxinidir}/tests/opentelemetry-test/src/ + mypy: MYPYPATH={toxinidir}/opentelemetry-api/src/:{toxinidir}/tests/opentelemetry-test-utils/src/ changedir = api: opentelemetry-api/tests @@ -108,7 +108,7 @@ commands_pre = py3{6,7,8,9,10}: python -m pip install -U pip setuptools wheel ; Install common packages for all the tests. These are not needed in all the ; cases but it saves a lot of boilerplate in this file. - opentelemetry: pip install {toxinidir}/opentelemetry-api {toxinidir}/opentelemetry-semantic-conventions {toxinidir}/opentelemetry-sdk {toxinidir}/tests/opentelemetry-test + opentelemetry: pip install {toxinidir}/opentelemetry-api {toxinidir}/opentelemetry-semantic-conventions {toxinidir}/opentelemetry-sdk {toxinidir}/tests/opentelemetry-test-utils protobuf: pip install {toxinidir}/opentelemetry-proto @@ -192,7 +192,7 @@ commands_pre = python -m pip install -e {toxinidir}/opentelemetry-semantic-conventions[test] python -m pip install -e {toxinidir}/opentelemetry-sdk[test] python -m pip install -e {toxinidir}/opentelemetry-proto[test] - python -m pip install -e {toxinidir}/tests/opentelemetry-test[test] + python -m pip install -e {toxinidir}/tests/opentelemetry-test-utils[test] python -m pip install -e {toxinidir}/shim/opentelemetry-opentracing-shim[test] python -m pip install -e {toxinidir}/exporter/opentelemetry-exporter-jaeger-proto-grpc[test] python -m pip install -e {toxinidir}/exporter/opentelemetry-exporter-jaeger-thrift[test] @@ -254,7 +254,7 @@ commands_pre = pip install -e {toxinidir}/opentelemetry-api \ -e {toxinidir}/opentelemetry-semantic-conventions \ -e {toxinidir}/opentelemetry-sdk \ - -e {toxinidir}/tests/opentelemetry-test \ + -e {toxinidir}/tests/opentelemetry-test-utils \ -e {toxinidir}/exporter/opentelemetry-exporter-opencensus \ -e {toxinidir}/opentelemetry-proto \ -e {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-grpc \