Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 7d11cf1

Browse files
c24tc24t
authored
Move shared test code from ext/ to tests/ (open-telemetry#559)
opentelemetry-ext-testutil is a package with shared test classes used by ext packages (right now only opentelemetry-ext-flask). We don't release this package, just import it in other tests. Right now, on each release, we build everything in ext/. This means whoever does the release has to remember to exclude this package when they push the others to PyPI. This moves the files and package: Move files ext/opentelemetry-ext-testutil -> tests/util Move package opentelemetry.ext.testutil -> opentelemetry.test This makes maintainers' lives easier, but it does mean that other packages that use testutils will have to install install the opentelemetry.test package from source. But this is already the case since we don't publish opentelemetry-ext-testutil. we move shared test code back into the main repo until we move a package that depends on it into a separate repo, at which point we'll have to put this code in its own top-level package.
1 parent 380ce95 commit 7d11cf1

File tree

11 files changed

+10
-13
lines changed

11 files changed

+10
-13
lines changed

‎ext/opentelemetry-ext-flask/setup.cfg

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ install_requires =
4747

4848
[options.extras_require]
4949
test =
50-
opentelemetry-ext-testutil == 0.7.dev0
50+
flask~=1.0
51+
opentelemetry-test == 0.7.dev0
5152

5253
[options.packages.find]
5354
where = src

‎ext/opentelemetry-ext-flask/tests/test_flask_integration.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from werkzeug.wrappers import BaseResponse
2020

2121
from opentelemetry import trace as trace_api
22-
from opentelemetry.ext.testutil.wsgitestutil import WsgiTestBase
22+
from opentelemetry.test.wsgitestutil import WsgiTestBase
2323

2424

2525
def expected_attributes(override_attributes):
@@ -78,10 +78,7 @@ def assert_environ():
7878

7979
def test_simple(self):
8080
expected_attrs = expected_attributes(
81-
{
82-
"http.target": "/hello/123",
83-
"http.route": "/hello/<int:helloid>",
84-
}
81+
{"http.target": "/hello/123", "http.route": "/hello/<int:helloid>"}
8582
)
8683
resp = self.client.get("/hello/123")
8784
self.assertEqual(200, resp.status_code)

‎ext/opentelemetry-ext-wsgi/setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ install_requires =
4444

4545
[options.extras_require]
4646
test =
47-
opentelemetry-ext-testutil == 0.7.dev0
47+
opentelemetry-test == 0.7.dev0
4848

4949
[options.packages.find]
5050
where = src

‎ext/opentelemetry-ext-wsgi/tests/test_wsgi_middleware.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import opentelemetry.ext.wsgi as otel_wsgi
2222
from opentelemetry import trace as trace_api
23-
from opentelemetry.ext.testutil.wsgitestutil import WsgiTestBase
23+
from opentelemetry.test.wsgitestutil import WsgiTestBase
2424

2525

2626
class Response:

‎ext/opentelemetry-ext-testutil/README.rst renamed to ‎tests/util/README.rst

File renamed without changes.

‎ext/opentelemetry-ext-testutil/setup.cfg renamed to ‎tests/util/setup.cfg

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,13 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14-
#
1514

1615
[metadata]
17-
name = opentelemetry-ext-testutil
16+
name = opentelemetry-test
1817
description = Test utilities for OpenTelemetry unit tests
1918
author = OpenTelemetry Authors
2019
author_email = [email protected]
21-
url = https://github.com/open-telemetry/opentelemetry-python/ext/opentelemetry-ext-testutil
20+
url = https://github.com/open-telemetry/opentelemetry-python/tests/util
2221
platforms = any
2322
license = Apache-2.0
2423
classifiers =

‎ext/opentelemetry-ext-testutil/setup.py renamed to ‎tests/util/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
BASE_DIR = os.path.dirname(__file__)
1919
VERSION_FILENAME = os.path.join(
20-
BASE_DIR, "src", "opentelemetry", "ext", "testutil", "version.py"
20+
BASE_DIR, "src", "opentelemetry", "test", "version.py"
2121
)
2222
PACKAGE_INFO = {}
2323
with open(VERSION_FILENAME) as f:

‎ext/opentelemetry-ext-testutil/src/opentelemetry/ext/testutil/__init__.py renamed to ‎tests/util/src/opentelemetry/test/__init__.py

File renamed without changes.

‎ext/opentelemetry-ext-testutil/src/opentelemetry/ext/testutil/version.py renamed to ‎tests/util/src/opentelemetry/test/version.py

File renamed without changes.

‎ext/opentelemetry-ext-testutil/src/opentelemetry/ext/testutil/wsgitestutil.py renamed to ‎tests/util/src/opentelemetry/test/wsgitestutil.py

File renamed without changes.

‎tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ commands_pre =
151151
ext: pip install {toxinidir}/opentelemetry-api
152152
grpc: pip install {toxinidir}/ext/opentelemetry-ext-grpc
153153
grpc: pip install {toxinidir}/opentelemetry-sdk
154-
wsgi,flask: pip install {toxinidir}/ext/opentelemetry-ext-testutil
154+
wsgi,flask: pip install {toxinidir}/tests/util
155155
wsgi,flask: pip install {toxinidir}/ext/opentelemetry-ext-wsgi
156156
wsgi,flask: pip install {toxinidir}/opentelemetry-sdk
157157
flask: pip install {toxinidir}/opentelemetry-auto-instrumentation

0 commit comments

Comments
 (0)