From c2a5f1dc9007b3fe05fa92d345e3353d4467b331b64f805163db81c9cbd35ec0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Mon, 3 Mar 2025 10:33:30 +0000 Subject: [PATCH] - disable test broken in build env OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-opencensus?expand=0&rev=19 --- .gitattributes | 23 + .gitignore | 1 + _multibuild | 3 + opencensus-pr1002-remove-mock.patch | 1124 +++++++++++++++++++++ opencensus-python-0.11.4-1.1.13-gh.tar.gz | 3 + python-opencensus.changes | 97 ++ python-opencensus.spec | 100 ++ use-correct-assertion-methods.patch | 190 ++++ 8 files changed, 1541 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 _multibuild create mode 100644 opencensus-pr1002-remove-mock.patch create mode 100644 opencensus-python-0.11.4-1.1.13-gh.tar.gz create mode 100644 python-opencensus.changes create mode 100644 python-opencensus.spec create mode 100644 use-correct-assertion-methods.patch diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..fcc7b97 --- /dev/null +++ b/_multibuild @@ -0,0 +1,3 @@ + + test + diff --git a/opencensus-pr1002-remove-mock.patch b/opencensus-pr1002-remove-mock.patch new file mode 100644 index 0000000..f9a6f0e --- /dev/null +++ b/opencensus-pr1002-remove-mock.patch @@ -0,0 +1,1124 @@ +diff -Nru opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-azure/tests/test_azure_log_exporter.py opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-azure/tests/test_azure_log_exporter.py +--- opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-azure/tests/test_azure_log_exporter.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-azure/tests/test_azure_log_exporter.py 2024-03-10 10:14:31.790497939 +0100 +@@ -17,7 +17,10 @@ + import shutil + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.ext.azure import log_exporter + from opencensus.ext.azure.common.transport import TransportStatusCode +diff -Nru opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-azure/tests/test_azure_metrics_exporter.py opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-azure/tests/test_azure_metrics_exporter.py +--- opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-azure/tests/test_azure_metrics_exporter.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-azure/tests/test_azure_metrics_exporter.py 2024-03-10 10:14:31.793831313 +0100 +@@ -16,7 +16,10 @@ + import unittest + from datetime import datetime + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.common import utils + from opencensus.ext.azure.common.protocol import DataPoint +diff -Nru opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-azure/tests/test_azure_standard_metrics.py opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-azure/tests/test_azure_standard_metrics.py +--- opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-azure/tests/test_azure_standard_metrics.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-azure/tests/test_azure_standard_metrics.py 2024-03-10 10:14:31.793831313 +0100 +@@ -16,7 +16,10 @@ + import sys + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + import requests + + from opencensus.ext.azure.metrics_exporter import standard_metrics +diff -Nru opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-azure/tests/test_azure_statsbeat_metrics.py opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-azure/tests/test_azure_statsbeat_metrics.py +--- opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-azure/tests/test_azure_statsbeat_metrics.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-azure/tests/test_azure_statsbeat_metrics.py 2024-03-10 10:14:31.793831313 +0100 +@@ -17,7 +17,10 @@ + import platform + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + import requests + + from opencensus.ext.azure.common import Options +diff -Nru opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-azure/tests/test_azure_trace_exporter.py opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-azure/tests/test_azure_trace_exporter.py +--- opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-azure/tests/test_azure_trace_exporter.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-azure/tests/test_azure_trace_exporter.py 2024-03-10 10:14:31.793831313 +0100 +@@ -17,7 +17,10 @@ + import shutil + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.ext.azure import trace_exporter + from opencensus.ext.azure.common.transport import TransportStatusCode +diff -Nru opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-azure/tests/test_storage.py opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-azure/tests/test_storage.py +--- opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-azure/tests/test_storage.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-azure/tests/test_storage.py 2024-03-10 10:14:31.793831313 +0100 +@@ -16,7 +16,10 @@ + import shutil + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.ext.azure.common.storage import ( + LocalFileBlob, +diff -Nru opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-azure/tests/test_transport_mixin.py opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-azure/tests/test_transport_mixin.py +--- opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-azure/tests/test_transport_mixin.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-azure/tests/test_transport_mixin.py 2024-03-10 10:14:31.793831313 +0100 +@@ -17,7 +17,10 @@ + import shutil + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + import requests + from azure.core.exceptions import ClientAuthenticationError + from azure.identity._exceptions import CredentialUnavailableError +diff -Nru opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-dbapi/tests/test_dbapi_trace.py opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-dbapi/tests/test_dbapi_trace.py +--- opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-dbapi/tests/test_dbapi_trace.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-dbapi/tests/test_dbapi_trace.py 2024-03-10 10:14:31.793831313 +0100 +@@ -14,7 +14,10 @@ + + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.ext.dbapi import trace + +diff -Nru opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-django/tests/test_django_db_middleware.py opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-django/tests/test_django_db_middleware.py +--- opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-django/tests/test_django_db_middleware.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-django/tests/test_django_db_middleware.py 2024-03-10 10:14:31.793831313 +0100 +@@ -16,7 +16,10 @@ + from collections import namedtuple + + import django +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + import pytest + from django.http import HttpResponse + from django.test.utils import teardown_test_environment +diff -Nru opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-django/tests/test_django_middleware.py opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-django/tests/test_django_middleware.py +--- opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-django/tests/test_django_middleware.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-django/tests/test_django_middleware.py 2024-03-10 10:14:31.793831313 +0100 +@@ -16,7 +16,10 @@ + import traceback + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + from django.http import HttpResponse + from django.test import RequestFactory + from django.test.utils import teardown_test_environment +diff -Nru opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-flask/tests/test_flask_middleware.py opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-flask/tests/test_flask_middleware.py +--- opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-flask/tests/test_flask_middleware.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-flask/tests/test_flask_middleware.py 2024-03-10 10:14:31.797164686 +0100 +@@ -18,7 +18,10 @@ + import unittest + + import flask +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + from google.rpc import code_pb2 + from werkzeug.exceptions import NotFound + +diff -Nru opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-google-cloud-clientlibs/tests/test_google_cloud_clientlibs_trace.py opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-google-cloud-clientlibs/tests/test_google_cloud_clientlibs_trace.py +--- opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-google-cloud-clientlibs/tests/test_google_cloud_clientlibs_trace.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-google-cloud-clientlibs/tests/test_google_cloud_clientlibs_trace.py 2024-03-10 10:14:31.797164686 +0100 +@@ -15,7 +15,10 @@ + import unittest + + import grpc +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.ext.google_cloud_clientlibs import trace + +diff -Nru opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-grpc/tests/test_client_interceptor.py opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-grpc/tests/test_client_interceptor.py +--- opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-grpc/tests/test_client_interceptor.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-grpc/tests/test_client_interceptor.py 2024-03-10 10:14:31.797164686 +0100 +@@ -17,7 +17,10 @@ + import unittest + + import grpc +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + from google.api_core import bidi + from google.protobuf import proto_builder + from grpc.framework.foundation import logging_pool +diff -Nru opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-grpc/tests/test_server_interceptor.py opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-grpc/tests/test_server_interceptor.py +--- opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-grpc/tests/test_server_interceptor.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-grpc/tests/test_server_interceptor.py 2024-03-10 10:14:31.797164686 +0100 +@@ -15,7 +15,9 @@ + import unittest + + import grpc +-import mock ++try: ++ from unittest import mock ++except ImportError: + from google.rpc import code_pb2 + + from opencensus.ext.grpc import server_interceptor +diff -Nru opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-httplib/tests/test_httplib_trace.py opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-httplib/tests/test_httplib_trace.py +--- opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-httplib/tests/test_httplib_trace.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-httplib/tests/test_httplib_trace.py 2024-03-10 10:14:31.797164686 +0100 +@@ -14,7 +14,10 @@ + + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.ext.httplib import trace + from opencensus.trace import span as span_module +diff -Nru opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-jaeger/tests/test_jaeger_exporter.py opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-jaeger/tests/test_jaeger_exporter.py +--- opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-jaeger/tests/test_jaeger_exporter.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-jaeger/tests/test_jaeger_exporter.py 2024-03-10 10:14:31.797164686 +0100 +@@ -14,7 +14,10 @@ + + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.ext.jaeger import trace_exporter + from opencensus.ext.jaeger.trace_exporter.gen.jaeger import jaeger +diff -Nru opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-mysql/tests/test_mysql_trace.py opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-mysql/tests/test_mysql_trace.py +--- opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-mysql/tests/test_mysql_trace.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-mysql/tests/test_mysql_trace.py 2024-03-10 10:14:31.797164686 +0100 +@@ -14,7 +14,10 @@ + + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.ext.mysql import trace + +diff -Nru opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-ocagent/tests/test_stats_exporter.py opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-ocagent/tests/test_stats_exporter.py +--- opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-ocagent/tests/test_stats_exporter.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-ocagent/tests/test_stats_exporter.py 2024-03-10 10:14:31.797164686 +0100 +@@ -21,7 +21,10 @@ + from datetime import datetime + + import grpc +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + from google.protobuf import timestamp_pb2 + + from opencensus.common import resource, utils +diff -Nru opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-ocagent/tests/test_trace_exporter.py opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-ocagent/tests/test_trace_exporter.py +--- opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-ocagent/tests/test_trace_exporter.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-ocagent/tests/test_trace_exporter.py 2024-03-10 10:14:31.797164686 +0100 +@@ -18,7 +18,10 @@ + import unittest + + import grpc +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.common.version import __version__ + from opencensus.ext.ocagent.trace_exporter import TraceExporter +diff -Nru opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-postgresql/tests/test_postgresql_trace.py opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-postgresql/tests/test_postgresql_trace.py +--- opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-postgresql/tests/test_postgresql_trace.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-postgresql/tests/test_postgresql_trace.py 2024-03-10 10:14:31.800498059 +0100 +@@ -14,7 +14,10 @@ + + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.ext.postgresql import trace + +diff -Nru opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-prometheus/tests/test_prometheus_stats.py opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-prometheus/tests/test_prometheus_stats.py +--- opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-prometheus/tests/test_prometheus_stats.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-prometheus/tests/test_prometheus_stats.py 2024-03-10 10:14:31.800498059 +0100 +@@ -15,7 +15,10 @@ + import unittest + from datetime import datetime + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + from prometheus_client.core import Sample + + from opencensus.ext.prometheus import stats_exporter as prometheus +diff -Nru opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-pymongo/tests/test_pymongo_trace.py opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-pymongo/tests/test_pymongo_trace.py +--- opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-pymongo/tests/test_pymongo_trace.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-pymongo/tests/test_pymongo_trace.py 2024-03-10 10:14:31.800498059 +0100 +@@ -14,7 +14,10 @@ + + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.ext.pymongo import trace + +diff -Nru opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-pymysql/tests/test_pymysql_trace.py opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-pymysql/tests/test_pymysql_trace.py +--- opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-pymysql/tests/test_pymysql_trace.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-pymysql/tests/test_pymysql_trace.py 2024-03-10 10:14:31.800498059 +0100 +@@ -14,7 +14,10 @@ + + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.ext.pymysql import trace + +diff -Nru opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-pyramid/tests/test_pyramid_config.py opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-pyramid/tests/test_pyramid_config.py +--- opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-pyramid/tests/test_pyramid_config.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-pyramid/tests/test_pyramid_config.py 2024-03-10 10:14:31.800498059 +0100 +@@ -14,7 +14,10 @@ + + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.ext.pyramid import config + +diff -Nru opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-pyramid/tests/test_pyramid_middleware.py opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-pyramid/tests/test_pyramid_middleware.py +--- opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-pyramid/tests/test_pyramid_middleware.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-pyramid/tests/test_pyramid_middleware.py 2024-03-10 10:14:31.800498059 +0100 +@@ -17,7 +17,10 @@ + + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + from pyramid.registry import Registry + from pyramid.response import Response + from pyramid.testing import DummyRequest +diff -Nru opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-requests/tests/test_requests_trace.py opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-requests/tests/test_requests_trace.py +--- opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-requests/tests/test_requests_trace.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-requests/tests/test_requests_trace.py 2024-03-10 10:14:31.800498059 +0100 +@@ -14,7 +14,10 @@ + + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + import requests + + from opencensus.ext.requests import trace +diff -Nru opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-sqlalchemy/tests/test_sqlalchemy_trace.py opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-sqlalchemy/tests/test_sqlalchemy_trace.py +--- opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-sqlalchemy/tests/test_sqlalchemy_trace.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-sqlalchemy/tests/test_sqlalchemy_trace.py 2024-03-10 10:14:31.800498059 +0100 +@@ -14,7 +14,10 @@ + + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.ext.sqlalchemy import trace + from opencensus.trace import span as span_module +diff -Nru opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-stackdriver/tests/test_stackdriver_exporter.py opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-stackdriver/tests/test_stackdriver_exporter.py +--- opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-stackdriver/tests/test_stackdriver_exporter.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-stackdriver/tests/test_stackdriver_exporter.py 2024-03-10 10:14:31.800498059 +0100 +@@ -14,7 +14,10 @@ + + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.common.version import __version__ + from opencensus.ext.stackdriver import trace_exporter +diff -Nru opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-stackdriver/tests/test_stackdriver_stats.py opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-stackdriver/tests/test_stackdriver_stats.py +--- opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-stackdriver/tests/test_stackdriver_stats.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-stackdriver/tests/test_stackdriver_stats.py 2024-03-10 10:14:31.800498059 +0100 +@@ -16,7 +16,10 @@ + from datetime import datetime, timedelta + + import google.auth +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + from google.api import metric_pb2 + from google.cloud import monitoring_v3 + +diff -Nru opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-threading/tests/test_threading_trace.py opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-threading/tests/test_threading_trace.py +--- opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-threading/tests/test_threading_trace.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-threading/tests/test_threading_trace.py 2024-03-10 10:14:31.800498059 +0100 +@@ -17,7 +17,10 @@ + from concurrent.futures import ThreadPoolExecutor + from multiprocessing.pool import Pool + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.ext.threading import trace + from opencensus.trace import execution_context, tracer +diff -Nru opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-zipkin/tests/test_zipkin_exporter.py opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-zipkin/tests/test_zipkin_exporter.py +--- opencensus-python-0.11.4-1.1.13.orig/contrib/opencensus-ext-zipkin/tests/test_zipkin_exporter.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/contrib/opencensus-ext-zipkin/tests/test_zipkin_exporter.py 2024-03-10 10:14:31.803831433 +0100 +@@ -15,7 +15,10 @@ + import unittest + from datetime import datetime + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.ext.zipkin import trace_exporter + from opencensus.trace import span_context +diff -Nru opencensus-python-0.11.4-1.1.13.orig/tests/system/stats/stackdriver/stackdriver_stats_test.py opencensus-python-0.11.4-1.1.13/tests/system/stats/stackdriver/stackdriver_stats_test.py +--- opencensus-python-0.11.4-1.1.13.orig/tests/system/stats/stackdriver/stackdriver_stats_test.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/tests/system/stats/stackdriver/stackdriver_stats_test.py 2024-03-10 10:14:31.803831433 +0100 +@@ -17,7 +17,10 @@ + import sys + import time + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + from google.cloud import monitoring_v3 + + from opencensus.ext.stackdriver import stats_exporter as stackdriver +diff -Nru opencensus-python-0.11.4-1.1.13.orig/tests/unit/common/monitored_resource_util/test_aws_identity_doc_utils.py opencensus-python-0.11.4-1.1.13/tests/unit/common/monitored_resource_util/test_aws_identity_doc_utils.py +--- opencensus-python-0.11.4-1.1.13.orig/tests/unit/common/monitored_resource_util/test_aws_identity_doc_utils.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/tests/unit/common/monitored_resource_util/test_aws_identity_doc_utils.py 2024-03-10 10:14:31.803831433 +0100 +@@ -15,7 +15,10 @@ + import json + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.common.monitored_resource import aws_identity_doc_utils + +diff -Nru opencensus-python-0.11.4-1.1.13.orig/tests/unit/common/monitored_resource_util/test_gcp_metadata_config.py opencensus-python-0.11.4-1.1.13/tests/unit/common/monitored_resource_util/test_gcp_metadata_config.py +--- opencensus-python-0.11.4-1.1.13.orig/tests/unit/common/monitored_resource_util/test_gcp_metadata_config.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/tests/unit/common/monitored_resource_util/test_gcp_metadata_config.py 2024-03-10 10:14:31.803831433 +0100 +@@ -15,7 +15,10 @@ + import os + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.common.monitored_resource import gcp_metadata_config + +diff -Nru opencensus-python-0.11.4-1.1.13.orig/tests/unit/common/monitored_resource_util/test_k8s_utils.py opencensus-python-0.11.4-1.1.13/tests/unit/common/monitored_resource_util/test_k8s_utils.py +--- opencensus-python-0.11.4-1.1.13.orig/tests/unit/common/monitored_resource_util/test_k8s_utils.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/tests/unit/common/monitored_resource_util/test_k8s_utils.py 2024-03-10 10:14:31.803831433 +0100 +@@ -15,7 +15,10 @@ + import os + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.common.monitored_resource import k8s_utils + +diff -Nru opencensus-python-0.11.4-1.1.13.orig/tests/unit/common/monitored_resource_util/test_monitored_resource.py opencensus-python-0.11.4-1.1.13/tests/unit/common/monitored_resource_util/test_monitored_resource.py +--- opencensus-python-0.11.4-1.1.13.orig/tests/unit/common/monitored_resource_util/test_monitored_resource.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/tests/unit/common/monitored_resource_util/test_monitored_resource.py 2024-03-10 10:14:31.803831433 +0100 +@@ -16,7 +16,10 @@ + import sys + from contextlib import contextmanager + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.common.monitored_resource import monitored_resource + +diff -Nru opencensus-python-0.11.4-1.1.13.orig/tests/unit/common/test_http_handler.py opencensus-python-0.11.4-1.1.13/tests/unit/common/test_http_handler.py +--- opencensus-python-0.11.4-1.1.13.orig/tests/unit/common/test_http_handler.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/tests/unit/common/test_http_handler.py 2024-03-10 10:14:31.803831433 +0100 +@@ -16,7 +16,10 @@ + import socket + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.common.http_handler import get_request + +diff -Nru opencensus-python-0.11.4-1.1.13.orig/tests/unit/common/test_resource.py opencensus-python-0.11.4-1.1.13/tests/unit/common/test_resource.py +--- opencensus-python-0.11.4-1.1.13.orig/tests/unit/common/test_resource.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/tests/unit/common/test_resource.py 2024-03-10 10:14:31.803831433 +0100 +@@ -17,7 +17,10 @@ + import os + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.common import resource as resource_module + from opencensus.common.resource import Resource +diff -Nru opencensus-python-0.11.4-1.1.13.orig/tests/unit/common/test_utils.py opencensus-python-0.11.4-1.1.13/tests/unit/common/test_utils.py +--- opencensus-python-0.11.4-1.1.13.orig/tests/unit/common/test_utils.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/tests/unit/common/test_utils.py 2024-03-10 10:14:31.803831433 +0100 +@@ -29,7 +29,10 @@ + import unittest + import weakref + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.common import utils + +diff -Nru opencensus-python-0.11.4-1.1.13.orig/tests/unit/common/transports/test_async.py opencensus-python-0.11.4-1.1.13/tests/unit/common/transports/test_async.py +--- opencensus-python-0.11.4-1.1.13.orig/tests/unit/common/transports/test_async.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/tests/unit/common/transports/test_async.py 2024-03-10 10:14:31.803831433 +0100 +@@ -14,7 +14,10 @@ + + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.common.transports import async_ + +diff -Nru opencensus-python-0.11.4-1.1.13.orig/tests/unit/common/transports/test_sync.py opencensus-python-0.11.4-1.1.13/tests/unit/common/transports/test_sync.py +--- opencensus-python-0.11.4-1.1.13.orig/tests/unit/common/transports/test_sync.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/tests/unit/common/transports/test_sync.py 2024-03-10 10:14:31.803831433 +0100 +@@ -14,7 +14,10 @@ + + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.common.transports import sync + +diff -Nru opencensus-python-0.11.4-1.1.13.orig/tests/unit/log/test_log.py opencensus-python-0.11.4-1.1.13/tests/unit/log/test_log.py +--- opencensus-python-0.11.4-1.1.13.orig/tests/unit/log/test_log.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/tests/unit/log/test_log.py 2024-03-10 10:14:31.803831433 +0100 +@@ -16,7 +16,10 @@ + import sys + from contextlib import contextmanager + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus import log + +diff -Nru opencensus-python-0.11.4-1.1.13.orig/tests/unit/metrics/export/test_cumulative.py opencensus-python-0.11.4-1.1.13/tests/unit/metrics/export/test_cumulative.py +--- opencensus-python-0.11.4-1.1.13.orig/tests/unit/metrics/export/test_cumulative.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/tests/unit/metrics/export/test_cumulative.py 2024-03-10 10:14:31.803831433 +0100 +@@ -14,7 +14,10 @@ + + import unittest + +-from mock import Mock ++try: ++ from unittest.mock import Mock ++except ImportError: ++ from mock import Mock + + from opencensus.metrics.export import cumulative, gauge, metric_descriptor + from opencensus.metrics.export import value as value_module +diff -Nru opencensus-python-0.11.4-1.1.13.orig/tests/unit/metrics/export/test_gauge.py opencensus-python-0.11.4-1.1.13/tests/unit/metrics/export/test_gauge.py +--- opencensus-python-0.11.4-1.1.13.orig/tests/unit/metrics/export/test_gauge.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/tests/unit/metrics/export/test_gauge.py 2024-03-10 10:14:31.803831433 +0100 +@@ -15,7 +15,10 @@ + import gc + import unittest + +-from mock import Mock ++try: ++ from unittest.mock import Mock ++except ImportError: ++ from mock import Mock + + from opencensus.metrics.export import gauge, metric_descriptor + from opencensus.metrics.export import value as value_module +diff -Nru opencensus-python-0.11.4-1.1.13.orig/tests/unit/metrics/test_transport.py opencensus-python-0.11.4-1.1.13/tests/unit/metrics/test_transport.py +--- opencensus-python-0.11.4-1.1.13.orig/tests/unit/metrics/test_transport.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/tests/unit/metrics/test_transport.py 2024-03-10 10:14:31.807164806 +0100 +@@ -16,7 +16,10 @@ + import sys + import time + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.metrics import transport + +diff -Nru opencensus-python-0.11.4-1.1.13.orig/tests/unit/stats/test_aggregation_data.py opencensus-python-0.11.4-1.1.13/tests/unit/stats/test_aggregation_data.py +--- opencensus-python-0.11.4-1.1.13.orig/tests/unit/stats/test_aggregation_data.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/tests/unit/stats/test_aggregation_data.py 2024-03-10 10:14:31.807164806 +0100 +@@ -16,7 +16,10 @@ + import unittest + from datetime import datetime + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.metrics.export import point + from opencensus.metrics.export import value as value_module +diff -Nru opencensus-python-0.11.4-1.1.13.orig/tests/unit/stats/test_aggregation.py opencensus-python-0.11.4-1.1.13/tests/unit/stats/test_aggregation.py +--- opencensus-python-0.11.4-1.1.13.orig/tests/unit/stats/test_aggregation.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/tests/unit/stats/test_aggregation.py 2024-03-10 10:14:31.807164806 +0100 +@@ -14,7 +14,10 @@ + + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.metrics.export import value + from opencensus.stats import aggregation as aggregation_module +diff -Nru opencensus-python-0.11.4-1.1.13.orig/tests/unit/stats/test_base_stats.py opencensus-python-0.11.4-1.1.13/tests/unit/stats/test_base_stats.py +--- opencensus-python-0.11.4-1.1.13.orig/tests/unit/stats/test_base_stats.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/tests/unit/stats/test_base_stats.py 2024-03-10 10:14:31.807164806 +0100 +@@ -14,7 +14,10 @@ + + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.stats import base_exporter + +diff -Nru opencensus-python-0.11.4-1.1.13.orig/tests/unit/stats/test_measurement_map.py opencensus-python-0.11.4-1.1.13/tests/unit/stats/test_measurement_map.py +--- opencensus-python-0.11.4-1.1.13.orig/tests/unit/stats/test_measurement_map.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/tests/unit/stats/test_measurement_map.py 2024-03-10 10:14:31.807164806 +0100 +@@ -14,7 +14,10 @@ + + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.stats import measurement_map as measurement_map_module + from opencensus.tags import Tag, TagContext, TagMap +diff -Nru opencensus-python-0.11.4-1.1.13.orig/tests/unit/stats/test_measure_to_view_map.py opencensus-python-0.11.4-1.1.13/tests/unit/stats/test_measure_to_view_map.py +--- opencensus-python-0.11.4-1.1.13.orig/tests/unit/stats/test_measure_to_view_map.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/tests/unit/stats/test_measure_to_view_map.py 2024-03-10 10:14:31.807164806 +0100 +@@ -14,7 +14,10 @@ + + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.stats import measure_to_view_map as measure_to_view_map_module + from opencensus.stats.aggregation import CountAggregation +diff -Nru opencensus-python-0.11.4-1.1.13.orig/tests/unit/stats/test_metric_utils.py opencensus-python-0.11.4-1.1.13/tests/unit/stats/test_metric_utils.py +--- opencensus-python-0.11.4-1.1.13.orig/tests/unit/stats/test_metric_utils.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/tests/unit/stats/test_metric_utils.py 2024-03-10 10:14:31.807164806 +0100 +@@ -15,7 +15,10 @@ + import datetime + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.metrics.export import metric_descriptor, point, value + from opencensus.stats import ( +diff -Nru opencensus-python-0.11.4-1.1.13.orig/tests/unit/stats/test_stats_recorder.py opencensus-python-0.11.4-1.1.13/tests/unit/stats/test_stats_recorder.py +--- opencensus-python-0.11.4-1.1.13.orig/tests/unit/stats/test_stats_recorder.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/tests/unit/stats/test_stats_recorder.py 2024-03-10 10:14:31.807164806 +0100 +@@ -14,7 +14,10 @@ + + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.stats import execution_context + from opencensus.stats import stats_recorder as stats_recorder_module +diff -Nru opencensus-python-0.11.4-1.1.13.orig/tests/unit/stats/test_view_data.py opencensus-python-0.11.4-1.1.13/tests/unit/stats/test_view_data.py +--- opencensus-python-0.11.4-1.1.13.orig/tests/unit/stats/test_view_data.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/tests/unit/stats/test_view_data.py 2024-03-10 10:14:31.807164806 +0100 +@@ -15,7 +15,10 @@ + import unittest + from datetime import datetime + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.common import utils + from opencensus.stats import aggregation as aggregation_module +diff -Nru opencensus-python-0.11.4-1.1.13.orig/tests/unit/stats/test_view_manager.py opencensus-python-0.11.4-1.1.13/tests/unit/stats/test_view_manager.py +--- opencensus-python-0.11.4-1.1.13.orig/tests/unit/stats/test_view_manager.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/tests/unit/stats/test_view_manager.py 2024-03-10 10:14:31.807164806 +0100 +@@ -14,7 +14,10 @@ + + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.stats import execution_context + from opencensus.stats import view_manager as view_manager_module +diff -Nru opencensus-python-0.11.4-1.1.13.orig/tests/unit/stats/test_view.py opencensus-python-0.11.4-1.1.13/tests/unit/stats/test_view.py +--- opencensus-python-0.11.4-1.1.13.orig/tests/unit/stats/test_view.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/tests/unit/stats/test_view.py 2024-03-10 10:14:31.807164806 +0100 +@@ -14,7 +14,10 @@ + + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.metrics.export import metric_descriptor + from opencensus.stats import aggregation, measure +diff -Nru opencensus-python-0.11.4-1.1.13.orig/tests/unit/trace/exporters/test_logging_exporter.py opencensus-python-0.11.4-1.1.13/tests/unit/trace/exporters/test_logging_exporter.py +--- opencensus-python-0.11.4-1.1.13.orig/tests/unit/trace/exporters/test_logging_exporter.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/tests/unit/trace/exporters/test_logging_exporter.py 2024-03-10 10:14:31.807164806 +0100 +@@ -15,7 +15,10 @@ + import logging + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.trace import logging_exporter, span_context + from opencensus.trace import span_data as span_data_module +diff -Nru opencensus-python-0.11.4-1.1.13.orig/tests/unit/trace/propagation/test_b3_format.py opencensus-python-0.11.4-1.1.13/tests/unit/trace/propagation/test_b3_format.py +--- opencensus-python-0.11.4-1.1.13.orig/tests/unit/trace/propagation/test_b3_format.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/tests/unit/trace/propagation/test_b3_format.py 2024-03-10 10:14:31.807164806 +0100 +@@ -14,7 +14,10 @@ + + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.trace.propagation import b3_format + from opencensus.trace.span_context import INVALID_SPAN_ID +diff -Nru opencensus-python-0.11.4-1.1.13.orig/tests/unit/trace/propagation/test_binary_format.py opencensus-python-0.11.4-1.1.13/tests/unit/trace/propagation/test_binary_format.py +--- opencensus-python-0.11.4-1.1.13.orig/tests/unit/trace/propagation/test_binary_format.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/tests/unit/trace/propagation/test_binary_format.py 2024-03-10 10:14:31.807164806 +0100 +@@ -14,7 +14,10 @@ + + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.trace.propagation import binary_format + +diff -Nru opencensus-python-0.11.4-1.1.13.orig/tests/unit/trace/propagation/test_text_format.py opencensus-python-0.11.4-1.1.13/tests/unit/trace/propagation/test_text_format.py +--- opencensus-python-0.11.4-1.1.13.orig/tests/unit/trace/propagation/test_text_format.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/tests/unit/trace/propagation/test_text_format.py 2024-03-10 10:14:31.807164806 +0100 +@@ -14,7 +14,10 @@ + + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.trace.propagation import text_format + +diff -Nru opencensus-python-0.11.4-1.1.13.orig/tests/unit/trace/samplers/test_always_off.py opencensus-python-0.11.4-1.1.13/tests/unit/trace/samplers/test_always_off.py +--- opencensus-python-0.11.4-1.1.13.orig/tests/unit/trace/samplers/test_always_off.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/tests/unit/trace/samplers/test_always_off.py 2024-03-10 10:14:31.807164806 +0100 +@@ -14,7 +14,10 @@ + + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + + class TestAlwaysOffSampler(unittest.TestCase): +diff -Nru opencensus-python-0.11.4-1.1.13.orig/tests/unit/trace/samplers/test_always_on.py opencensus-python-0.11.4-1.1.13/tests/unit/trace/samplers/test_always_on.py +--- opencensus-python-0.11.4-1.1.13.orig/tests/unit/trace/samplers/test_always_on.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/tests/unit/trace/samplers/test_always_on.py 2024-03-10 10:14:31.807164806 +0100 +@@ -14,7 +14,10 @@ + + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + + class TestAlwaysOnSampler(unittest.TestCase): +diff -Nru opencensus-python-0.11.4-1.1.13.orig/tests/unit/trace/samplers/test_base_sampler.py opencensus-python-0.11.4-1.1.13/tests/unit/trace/samplers/test_base_sampler.py +--- opencensus-python-0.11.4-1.1.13.orig/tests/unit/trace/samplers/test_base_sampler.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/tests/unit/trace/samplers/test_base_sampler.py 2024-03-10 10:14:31.810498180 +0100 +@@ -14,7 +14,10 @@ + + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + + class TestBaseSampler(unittest.TestCase): +diff -Nru opencensus-python-0.11.4-1.1.13.orig/tests/unit/trace/samplers/test_probability.py opencensus-python-0.11.4-1.1.13/tests/unit/trace/samplers/test_probability.py +--- opencensus-python-0.11.4-1.1.13.orig/tests/unit/trace/samplers/test_probability.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/tests/unit/trace/samplers/test_probability.py 2024-03-10 10:14:31.810498180 +0100 +@@ -14,7 +14,10 @@ + + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.trace import samplers + +diff -Nru opencensus-python-0.11.4-1.1.13.orig/tests/unit/trace/test_attributes.py opencensus-python-0.11.4-1.1.13/tests/unit/trace/test_attributes.py +--- opencensus-python-0.11.4-1.1.13.orig/tests/unit/trace/test_attributes.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/tests/unit/trace/test_attributes.py 2024-03-10 10:14:31.810498180 +0100 +@@ -14,7 +14,10 @@ + + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.trace import attributes as attributes_module + +diff -Nru opencensus-python-0.11.4-1.1.13.orig/tests/unit/trace/test_base_span.py opencensus-python-0.11.4-1.1.13/tests/unit/trace/test_base_span.py +--- opencensus-python-0.11.4-1.1.13.orig/tests/unit/trace/test_base_span.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/tests/unit/trace/test_base_span.py 2024-03-10 10:14:31.810498180 +0100 +@@ -14,7 +14,10 @@ + + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.trace.base_span import BaseSpan + +diff -Nru opencensus-python-0.11.4-1.1.13.orig/tests/unit/trace/test_blank_span.py opencensus-python-0.11.4-1.1.13/tests/unit/trace/test_blank_span.py +--- opencensus-python-0.11.4-1.1.13.orig/tests/unit/trace/test_blank_span.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/tests/unit/trace/test_blank_span.py 2024-03-10 10:14:31.810498180 +0100 +@@ -15,7 +15,10 @@ + import datetime + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.common import utils + from opencensus.trace.link import Link +diff -Nru opencensus-python-0.11.4-1.1.13.orig/tests/unit/trace/test_config_integration.py opencensus-python-0.11.4-1.1.13/tests/unit/trace/test_config_integration.py +--- opencensus-python-0.11.4-1.1.13.orig/tests/unit/trace/test_config_integration.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/tests/unit/trace/test_config_integration.py 2024-03-10 10:14:31.810498180 +0100 +@@ -14,7 +14,10 @@ + + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.trace import config_integration + +diff -Nru opencensus-python-0.11.4-1.1.13.orig/tests/unit/trace/test_execution_context.py opencensus-python-0.11.4-1.1.13/tests/unit/trace/test_execution_context.py +--- opencensus-python-0.11.4-1.1.13.orig/tests/unit/trace/test_execution_context.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/tests/unit/trace/test_execution_context.py 2024-03-10 10:14:31.810498180 +0100 +@@ -15,7 +15,10 @@ + import threading + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.trace import execution_context + +diff -Nru opencensus-python-0.11.4-1.1.13.orig/tests/unit/trace/test_ext_utils.py opencensus-python-0.11.4-1.1.13/tests/unit/trace/test_ext_utils.py +--- opencensus-python-0.11.4-1.1.13.orig/tests/unit/trace/test_ext_utils.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/tests/unit/trace/test_ext_utils.py 2024-03-10 10:14:31.810498180 +0100 +@@ -14,7 +14,10 @@ + + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + from google.rpc import code_pb2 + + from opencensus.trace import utils +diff -Nru opencensus-python-0.11.4-1.1.13.orig/tests/unit/trace/test_link.py opencensus-python-0.11.4-1.1.13/tests/unit/trace/test_link.py +--- opencensus-python-0.11.4-1.1.13.orig/tests/unit/trace/test_link.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/tests/unit/trace/test_link.py 2024-03-10 10:14:31.810498180 +0100 +@@ -14,7 +14,10 @@ + + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.trace import link as link_module + +diff -Nru opencensus-python-0.11.4-1.1.13.orig/tests/unit/trace/test_span.py opencensus-python-0.11.4-1.1.13/tests/unit/trace/test_span.py +--- opencensus-python-0.11.4-1.1.13.orig/tests/unit/trace/test_span.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/tests/unit/trace/test_span.py 2024-03-10 10:14:31.810498180 +0100 +@@ -16,7 +16,10 @@ + import unittest + from collections import OrderedDict + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + from google.rpc import code_pb2 + + from opencensus.common import utils +diff -Nru opencensus-python-0.11.4-1.1.13.orig/tests/unit/trace/test_stack_trace.py opencensus-python-0.11.4-1.1.13/tests/unit/trace/test_stack_trace.py +--- opencensus-python-0.11.4-1.1.13.orig/tests/unit/trace/test_stack_trace.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/tests/unit/trace/test_stack_trace.py 2024-03-10 10:14:31.810498180 +0100 +@@ -15,7 +15,10 @@ + import sys + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.trace import stack_trace as stack_trace_module + +diff -Nru opencensus-python-0.11.4-1.1.13.orig/tests/unit/trace/test_time_event.py opencensus-python-0.11.4-1.1.13/tests/unit/trace/test_time_event.py +--- opencensus-python-0.11.4-1.1.13.orig/tests/unit/trace/test_time_event.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/tests/unit/trace/test_time_event.py 2024-03-10 10:14:31.810498180 +0100 +@@ -15,7 +15,10 @@ + import unittest + from datetime import datetime + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.trace import time_event as time_event_module + +diff -Nru opencensus-python-0.11.4-1.1.13.orig/tests/unit/trace/test_tracer.py opencensus-python-0.11.4-1.1.13/tests/unit/trace/test_tracer.py +--- opencensus-python-0.11.4-1.1.13.orig/tests/unit/trace/test_tracer.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/tests/unit/trace/test_tracer.py 2024-03-10 10:14:31.810498180 +0100 +@@ -14,7 +14,10 @@ + + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.trace import samplers, span_data + from opencensus.trace import tracer as tracer_module +diff -Nru opencensus-python-0.11.4-1.1.13.orig/tests/unit/trace/tracers/test_context_tracer.py opencensus-python-0.11.4-1.1.13/tests/unit/trace/tracers/test_context_tracer.py +--- opencensus-python-0.11.4-1.1.13.orig/tests/unit/trace/tracers/test_context_tracer.py 2024-01-03 18:48:32.000000000 +0100 ++++ opencensus-python-0.11.4-1.1.13/tests/unit/trace/tracers/test_context_tracer.py 2024-03-10 10:14:31.810498180 +0100 +@@ -14,7 +14,10 @@ + + import unittest + +-import mock ++try: ++ from unittest import mock ++except ImportError: ++ import mock + + from opencensus.trace import execution_context, span + from opencensus.trace.tracers import context_tracer diff --git a/opencensus-python-0.11.4-1.1.13-gh.tar.gz b/opencensus-python-0.11.4-1.1.13-gh.tar.gz new file mode 100644 index 0000000..ba04158 --- /dev/null +++ b/opencensus-python-0.11.4-1.1.13-gh.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:807fa8eedc936d80c72f399b1e385da868caceb57dac676508a1d104d06f8427 +size 327133 diff --git a/python-opencensus.changes b/python-opencensus.changes new file mode 100644 index 0000000..cc9f645 --- /dev/null +++ b/python-opencensus.changes @@ -0,0 +1,97 @@ +------------------------------------------------------------------- +Fri Feb 28 14:45:01 UTC 2025 - Nico Krapp + +- disable test broken in build env + +------------------------------------------------------------------- +Tue Apr 9 02:34:22 UTC 2024 - Steve Kowalik + +- Add patch use-correct-assertion-methods.patch: + * Use non-removed assertion methods. + +------------------------------------------------------------------- +Tue Mar 26 12:57:43 UTC 2024 - John Paul Adrian Glaubitz + +- Switch build system from setuptools to pyproject.toml + + Add python-pip and python-wheel to BuildRequires + + Replace %python_build with %pyproject_wheel + + Replace %python_install with %pyproject_install + +------------------------------------------------------------------- +Tue Mar 5 23:00:18 UTC 2024 - John Paul Adrian Glaubitz + +- Update to 0.11.4 + * Changed bit-mapping for `httpx` and `fastapi` integrations +- Refresh patches for new version + * opencensus-pr1002-remove-mock.patch +- Switch package to modern Python Stack on SLE-15 + * Add %{?sle15_python_module_pythons} + * Drop %{?!python_module:%define python_module() python-%{**} python3-%{**}} + +------------------------------------------------------------------- +Thu Oct 19 10:40:18 UTC 2023 - Markéta Machová + +- update to 0.11.3 + * Updated azure modules +- sorry, six is still needed :( + +------------------------------------------------------------------- +Mon Jul 24 20:19:56 UTC 2023 - Dirk Müller + +- update to 0.11.2: + * Updated `azure`, `fastapi`,`flask` modules + * Updated `azure`, `httpx` modules + +------------------------------------------------------------------- +Tue Oct 18 10:24:27 UTC 2022 - John Paul Adrian Glaubitz + +- Update to 0.11.0 + * Updated `azure`, `context`, `flask`, `requests` modules +- from version 0.10.0 + * Add kwargs to derived gauge (#1135) +- from version 0.9.0 + * Make sure handler.flush() doesn't deadlock (#1112) +- Refresh patches for new version + * opencensus-pr1002-remove-mock.patch +- Update Requires from setup.py + +------------------------------------------------------------------- +Sat Oct 23 10:47:21 UTC 2021 - Ben Greiner + +- Update to 0.8.0 + * Added integration tracking functionality, includes django, + flask, http-lib, logging, mysql, postgresql, pymongo, pymysql, + pyramid, requests, sqlalchemy modules (#1065) + * Support Python 3.8, 3.9 (#1048) +- Releases 0.7.8 to 0.7.13 + * Updated azure, django, flask, requests, grpc, httplib, pyramid + stackdriver modules + * Hotfix for breaking change (#915) +- Remove test mock requirement for python3 + * opencensus-pr1002-remove-mock.patch + * gh#census-instrumentation/opencensus-python#1002 + +------------------------------------------------------------------- +Tue Mar 10 12:56:01 UTC 2020 - Tomáš Chvátal + +- Provide init in opencensus/ext folder to provide basis + structure for all the extensions + +------------------------------------------------------------------- +Tue Mar 10 11:25:01 UTC 2020 - Tomáš Chvátal + +- Switch to multibuild to not cycle during testing + +------------------------------------------------------------------- +Tue Feb 18 08:47:16 UTC 2020 - Tomáš Chvátal + +- Update to 0.7.7: + * Minor fixes +- Fix dependencies +- Enable testsuite + +------------------------------------------------------------------- +Wed Jan 29 12:57:16 UTC 2020 - John Paul Adrian Glaubitz + +- Initial build + + Version 0.7.6 diff --git a/python-opencensus.spec b/python-opencensus.spec new file mode 100644 index 0000000..a2d436c --- /dev/null +++ b/python-opencensus.spec @@ -0,0 +1,100 @@ +# +# spec file for package python-opencensus +# +# Copyright (c) 2025 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%define repo_version 0.11.4-1.1.13 + +%{?sle15_python_module_pythons} +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "test" +%define psuffix -test +%bcond_without test +%else +%define psuffix %{nil} +%bcond_with test +%endif +Name: python-opencensus%{psuffix} +Version: 0.11.4 +Release: 0 +Summary: A stats collection and distributed tracing framework +License: Apache-2.0 +URL: https://github.com/census-instrumentation/opencensus-python +Source: https://github.com/census-instrumentation/opencensus-python/archive/v%{repo_version}.tar.gz#/opencensus-python-%{repo_version}-gh.tar.gz +# PATCH-FIX-UPSTREAM opencensus-pr1002-remove-mock.patch -- gh#census-instrumentation/opencensus-python#1002 +Patch0: opencensus-pr1002-remove-mock.patch +# PATCH-FIX-UPSTREAM gh#census-instrumentation/opencensus-python#1243 +Patch1: use-correct-assertion-methods.patch +BuildRequires: %{python_module pip} +BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module wheel} +BuildRequires: fdupes +BuildRequires: python-rpm-macros +Requires: python-google-api-core < 3.0.0 +Requires: python-google-api-core >= 1.0.0 +Requires: python-opencensus-context >= 0.1.3 +Requires: python-six >= 1.16 +BuildArch: noarch +%if %{with test} +BuildRequires: %{python_module opencensus = %{version}} +BuildRequires: %{python_module pytest} +BuildRequires: %{python_module retrying} +%endif +%python_subpackages + +%description +OpenCensus - A stats collection and distributed tracing framework + +OpenCensus provides a framework to measure a server's resource usage +and collect performance stats. This repository contains Python related +utilities and supporting software needed by OpenCensus. + +%prep +%autosetup -p1 -n opencensus-python-%{repo_version} +# do not hardcode versions +sed -i -e 's:==:>=:g' setup.py + +%build +%pyproject_wheel + +%install +%if !%{with test} +%pyproject_install +# add ext infrastructure +%python_expand mkdir %{buildroot}%{$python_sitelib}/opencensus/ext/ +%python_expand cp %{buildroot}%{$python_sitelib}/opencensus/__init__* %{buildroot}%{$python_sitelib}/opencensus/ext +%python_expand [ -e %{buildroot}%{$python_sitelib}/opencensus/__pycache* ] && cp -r %{buildroot}%{$python_sitelib}/opencensus/__pycache* %{buildroot}%{$python_sitelib}/opencensus/ext + +%python_expand %fdupes %{buildroot}%{$python_sitelib} +%endif + +%check +%if %{with test} +# recursion error in mock != 3; gh#census-instrumentation/opencensus-python#868 +# test_create_from_traceback fails because paths are limited to 256 bytes and the path in the build env is too long. +donttest="TestGetExporterThreadPeriodic and (test_multiple_producers or test_threaded_export) or test_create_from_traceback" +%pytest tests/unit -k "not ($donttest)" +%endif + +%if !%{with test} +%files %{python_files} +%doc CHANGELOG.md README.rst +%license LICENSE +%{python_sitelib}/opencensus +%{python_sitelib}/opencensus-%{version}.dist-info +%endif + +%changelog diff --git a/use-correct-assertion-methods.patch b/use-correct-assertion-methods.patch new file mode 100644 index 0000000..782660d --- /dev/null +++ b/use-correct-assertion-methods.patch @@ -0,0 +1,190 @@ +From 9fc5f15d51ed33fa3d34592912c9e40c0756fd43 Mon Sep 17 00:00:00 2001 +From: Steve Kowalik +Date: Tue, 9 Apr 2024 12:23:25 +1000 +Subject: [PATCH] Use non-deprecated assertion methods + +Both assertDictContainsSubset and assertRaisesRegexp have been +deprecated, and removed in Python 3.12. Use assertGreaterEqual on the +dictionary items to compare dictionaries instead of +assertDictContainsSubset. + +Fixes #1242 +--- + .../tests/test_prometheus_stats.py | 6 ++--- + .../test_monitored_resource.py | 27 ++++++++++++------- + tests/unit/stats/test_aggregation_data.py | 12 ++++----- + tests/unit/stats/test_measurement_map.py | 8 +++--- + 4 files changed, 30 insertions(+), 23 deletions(-) + +diff --git a/contrib/opencensus-ext-prometheus/tests/test_prometheus_stats.py b/contrib/opencensus-ext-prometheus/tests/test_prometheus_stats.py +index bc19b47ef..2b4e1c8c2 100644 +--- a/contrib/opencensus-ext-prometheus/tests/test_prometheus_stats.py ++++ b/contrib/opencensus-ext-prometheus/tests/test_prometheus_stats.py +@@ -229,7 +229,7 @@ def test_collector_to_metric_invalid_dist(self): + collector.register_view(view) + desc = collector.registered_views[list(REGISTERED_VIEW)[0]] + +- with self.assertRaisesRegexp( ++ with self.assertRaisesRegex( + ValueError, + 'unsupported aggregation type '): + collector.to_metric(desc=desc, tag_values=[None], agg_data=agg) +@@ -278,8 +278,8 @@ def test_collector_collect_with_none_label_value(self): + + class TestPrometheusStatsExporter(unittest.TestCase): + def test_exporter_constructor_no_namespace(self): +- with self.assertRaisesRegexp(ValueError, +- 'Namespace can not be empty string.'): ++ with self.assertRaisesRegex(ValueError, ++ 'Namespace can not be empty string.'): + prometheus.new_stats_exporter(prometheus.Options()) + + def test_emit(self): +diff --git a/tests/unit/common/monitored_resource_util/test_monitored_resource.py b/tests/unit/common/monitored_resource_util/test_monitored_resource.py +index 38a1fe4b5..a97038841 100644 +--- a/tests/unit/common/monitored_resource_util/test_monitored_resource.py ++++ b/tests/unit/common/monitored_resource_util/test_monitored_resource.py +@@ -102,9 +102,11 @@ def test_gcp_gce_monitored_resource(self, gcp_md_mock): + with mock_gce_env(): + resource = monitored_resource.get_instance() + self.assertEqual(resource.get_type(), 'mock_resource_type') +- self.assertDictContainsSubset( +- {'mock_label_key': 'mock_label_value'}, resource.get_labels()) +- self.assertDictContainsSubset(mocked_labels, resource.get_labels()) ++ self.assertGreaterEqual( ++ resource.get_labels().items(), ++ {'mock_label_key': 'mock_label_value'}.items()) ++ self.assertGreaterEqual( ++ resource.get_labels().items(), mocked_labels.items()) + + @mock.patch('opencensus.common.monitored_resource.monitored_resource' + '.gcp_metadata_config.GcpMetadataConfig') +@@ -130,16 +132,19 @@ def test_gcp_k8s_monitored_resource(self, gcp_md_mock): + + gcp_md_mock.get_attribute.assert_called_once_with(cluster_name_key) + self.assertEqual(r1.get_type(), 'k8s_container') +- self.assertDictContainsSubset(mocked_labels, r1.get_labels()) ++ self.assertGreaterEqual( ++ r1.get_labels().items(), mocked_labels.items()) + + with mock_oc_env(): + with mock_k8s_env(): + r2 = monitored_resource.get_instance() + + self.assertEqual(r1.get_type(), 'k8s_container') +- self.assertDictContainsSubset(mocked_labels, r1.get_labels()) +- self.assertDictContainsSubset( +- {'mock_label_key': 'mock_label_value'}, r2.get_labels()) ++ self.assertGreaterEqual( ++ r1.get_labels().items(), mocked_labels.items()) ++ self.assertGreaterEqual( ++ r2.get_labels().items(), ++ {'mock_label_key': 'mock_label_value'}.items()) + + @mock.patch('opencensus.common.monitored_resource.monitored_resource' + '.aws_identity_doc_utils.AwsIdentityDocumentUtils') +@@ -163,9 +168,11 @@ def test_aws_monitored_resource(self, aws_md_mock): + with mock_aws_env(): + resource = monitored_resource.get_instance() + self.assertEqual(resource.get_type(), 'mock_resource_type') +- self.assertDictContainsSubset( +- {'mock_label_key': 'mock_label_value'}, resource.get_labels()) +- self.assertDictContainsSubset(mocked_labels, resource.get_labels()) ++ self.assertGreaterEqual( ++ resource.get_labels().items(), ++ {'mock_label_key': 'mock_label_value'}.items()) ++ self.assertGreaterEqual( ++ resource.get_labels().items(), mocked_labels.items()) + + def test_k8s_environment(self): + patch = mock.patch.dict(os.environ, +diff --git a/tests/unit/stats/test_aggregation_data.py b/tests/unit/stats/test_aggregation_data.py +index d1870f2c9..d009b91a2 100644 +--- a/tests/unit/stats/test_aggregation_data.py ++++ b/tests/unit/stats/test_aggregation_data.py +@@ -295,15 +295,15 @@ def test_exemplar(self): + def test_exemplar_null_attachments(self): + timestamp = time.time() + +- with self.assertRaisesRegexp(TypeError, +- 'attachments should not be empty'): ++ with self.assertRaisesRegex(TypeError, ++ 'attachments should not be empty'): + aggregation_data_module.Exemplar(6, timestamp, None) + + def test_exemplar_null_attachment_key(self): + timestamp = time.time() + attachment = {None: "one", "Two": "two"} + +- with self.assertRaisesRegexp( ++ with self.assertRaisesRegex( + TypeError, + 'attachment key should not be empty and should be a string'): + aggregation_data_module.Exemplar(6, timestamp, attachment) +@@ -312,7 +312,7 @@ def test_exemplar_null_attachment_value(self): + timestamp = time.time() + attachment = {"One": "one", "Two": None} + +- with self.assertRaisesRegexp( ++ with self.assertRaisesRegex( + TypeError, + 'attachment value should not be empty and should be a string'): + aggregation_data_module.Exemplar(6, timestamp, attachment) +@@ -321,7 +321,7 @@ def test_exemplar_int_attachment_key(self): + timestamp = time.time() + attachment = {1: "one", "Two": "two"} + +- with self.assertRaisesRegexp( ++ with self.assertRaisesRegex( + TypeError, + 'attachment key should not be empty and should be a string'): + aggregation_data_module.Exemplar(6, timestamp, attachment) +@@ -330,7 +330,7 @@ def test_exemplar_int_attachment_value(self): + timestamp = time.time() + attachment = {"One": "one", "Two": 2} + +- with self.assertRaisesRegexp( ++ with self.assertRaisesRegex( + TypeError, + 'attachment value should not be empty and should be a string'): + aggregation_data_module.Exemplar(6, timestamp, attachment) +diff --git a/tests/unit/stats/test_measurement_map.py b/tests/unit/stats/test_measurement_map.py +index 89add276b..44d41ee86 100644 +--- a/tests/unit/stats/test_measurement_map.py ++++ b/tests/unit/stats/test_measurement_map.py +@@ -58,7 +58,7 @@ def test_put_attachment_none_key(self): + test_value = 'testValue' + measurement_map = measurement_map_module.MeasurementMap( + measure_to_view_map=measure_to_view_map, attachments={}) +- with self.assertRaisesRegexp( ++ with self.assertRaisesRegex( + TypeError, + 'attachment key should not be empty and should be a string'): + measurement_map.measure_put_attachment(test_key, test_value) +@@ -69,7 +69,7 @@ def test_put_attachment_none_value(self): + test_value = None + measurement_map = measurement_map_module.MeasurementMap( + measure_to_view_map=measure_to_view_map, attachments={}) +- with self.assertRaisesRegexp( ++ with self.assertRaisesRegex( + TypeError, + 'attachment value should not be empty and should be a string'): + measurement_map.measure_put_attachment(test_key, test_value) +@@ -80,7 +80,7 @@ def test_put_attachment_int_key(self): + test_value = 'testValue' + measurement_map = measurement_map_module.MeasurementMap( + measure_to_view_map=measure_to_view_map, attachments={}) +- with self.assertRaisesRegexp( ++ with self.assertRaisesRegex( + TypeError, + 'attachment key should not be empty and should be a string'): + measurement_map.measure_put_attachment(test_key, test_value) +@@ -91,7 +91,7 @@ def test_put_attachment_int_value(self): + test_value = 42 + measurement_map = measurement_map_module.MeasurementMap( + measure_to_view_map=measure_to_view_map, attachments={}) +- with self.assertRaisesRegexp( ++ with self.assertRaisesRegex( + TypeError, + 'attachment value should not be empty and should be a string'): + measurement_map.measure_put_attachment(test_key, test_value)