Rename opentelemetry-test to opentelemetry-test-utils (#2273)

open-telemetry · Nov 11, 2021 · 0f31cbc · 0f31cbc
1 parent 5f8bb78
commit 0f31cbc
Show file tree

Hide file tree

Showing 17 changed files with 11 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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 → tests/opentelemetry-test-utils/README.rst b/tests/opentelemetry-test/README.rst → tests/opentelemetry-test-utils/README.rst
diff --git a/tests/opentelemetry-test/setup.cfg → tests/opentelemetry-test-utils/setup.cfg b/tests/opentelemetry-test/setup.cfg → 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 → tests/opentelemetry-test-utils/setup.py b/tests/opentelemetry-test/setup.py → tests/opentelemetry-test-utils/setup.py
diff --git a/...st/src/opentelemetry/test/asgitestutil.py → ...ls/src/opentelemetry/test/asgitestutil.py b/...st/src/opentelemetry/test/asgitestutil.py → ...ls/src/opentelemetry/test/asgitestutil.py
diff --git a/...rc/opentelemetry/test/concurrency_test.py → ...rc/opentelemetry/test/concurrency_test.py b/...rc/opentelemetry/test/concurrency_test.py → ...rc/opentelemetry/test/concurrency_test.py
diff --git a/...st/src/opentelemetry/test/globals_test.py → ...ls/src/opentelemetry/test/globals_test.py b/...st/src/opentelemetry/test/globals_test.py → ...ls/src/opentelemetry/test/globals_test.py
diff --git a/...y-test/src/opentelemetry/test/httptest.py → ...-utils/src/opentelemetry/test/httptest.py b/...y-test/src/opentelemetry/test/httptest.py → ...-utils/src/opentelemetry/test/httptest.py
diff --git a/...st/src/opentelemetry/test/mock_textmap.py → ...ls/src/opentelemetry/test/mock_textmap.py b/...st/src/opentelemetry/test/mock_textmap.py → ...ls/src/opentelemetry/test/mock_textmap.py
diff --git a/...st/src/opentelemetry/test/spantestutil.py → ...ls/src/opentelemetry/test/spantestutil.py b/...st/src/opentelemetry/test/spantestutil.py → ...ls/src/opentelemetry/test/spantestutil.py
diff --git a/...-test/src/opentelemetry/test/test_base.py → ...utils/src/opentelemetry/test/test_base.py b/...-test/src/opentelemetry/test/test_base.py → ...utils/src/opentelemetry/test/test_base.py
diff --git a/...ry-test/src/opentelemetry/test/version.py → ...t-utils/src/opentelemetry/test/version.py b/...ry-test/src/opentelemetry/test/version.py → ...t-utils/src/opentelemetry/test/version.py
diff --git a/...st/src/opentelemetry/test/wsgitestutil.py → ...ls/src/opentelemetry/test/wsgitestutil.py b/...st/src/opentelemetry/test/wsgitestutil.py → ...ls/src/opentelemetry/test/wsgitestutil.py
diff --git a/tox.ini b/tox.ini
@@ -79,7 +79,7 @@ setenv =
   ; i.e: CONTRIB_REPO_SHA=dde62cebffe519c35875af6d06fae053b3be65ec tox -e <env to test>
   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 \