Skip to content
This repository was archived by the owner on Sep 17, 2025. It is now read-only.

Commit 447674f

Browse files
authored
Improve test process (#635)
Instead of stick with the old version of test packages, always use the latest. Update test cases to resolve the deprecation warnings.
1 parent 992b223 commit 447674f

9 files changed

Lines changed: 36 additions & 35 deletions

File tree

AUTHORS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
OpenCensus Authors
1+
OpenCensus Authors

contrib/opencensus-ext-ocagent/tests/test_ocagent_utils.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,23 +33,23 @@ def test_datetime_str_to_proto_ts_conversion(self):
3333

3434
def test_datetime_str_to_proto_ts_conversion_none(self):
3535
proto_ts = utils.proto_ts_from_datetime_str(None)
36-
self.assertEquals(proto_ts.seconds, 0)
37-
self.assertEquals(proto_ts.nanos, 0)
36+
self.assertEqual(proto_ts.seconds, 0)
37+
self.assertEqual(proto_ts.nanos, 0)
3838

3939
def test_datetime_str_to_proto_ts_conversion_empty(self):
4040
proto_ts = utils.proto_ts_from_datetime_str('')
41-
self.assertEquals(proto_ts.seconds, 0)
42-
self.assertEquals(proto_ts.nanos, 0)
41+
self.assertEqual(proto_ts.seconds, 0)
42+
self.assertEqual(proto_ts.nanos, 0)
4343

4444
def test_datetime_str_to_proto_ts_conversion_invalid(self):
4545
proto_ts = utils.proto_ts_from_datetime_str('2018 08 22 T 11:53')
46-
self.assertEquals(proto_ts.seconds, 0)
47-
self.assertEquals(proto_ts.nanos, 0)
46+
self.assertEqual(proto_ts.seconds, 0)
47+
self.assertEqual(proto_ts.nanos, 0)
4848

4949
def test_datetime_to_proto_ts_conversion_none(self):
5050
proto_ts = utils.proto_ts_from_datetime(None)
51-
self.assertEquals(proto_ts.seconds, 0)
52-
self.assertEquals(proto_ts.nanos, 0)
51+
self.assertEqual(proto_ts.seconds, 0)
52+
self.assertEqual(proto_ts.nanos, 0)
5353

5454
def test_datetime_to_proto_ts_conversion(self):
5555
now = datetime.utcnow()

contrib/opencensus-ext-ocagent/tests/test_stats_exporter.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ def test_export_with_label_value(self):
142142

143143
handler = mock.Mock(spec=ocagent.ExportRpcHandler)
144144
ocagent.StatsExporter(handler).export_metrics(view_data)
145-
self.assertEquals(
145+
self.assertEqual(
146146
handler.send.call_args[0]
147147
[0].metrics[0].timeseries[0].label_values[0],
148148
metrics_pb2.LabelValue(has_value=True, value='test-key'))
@@ -161,7 +161,7 @@ def test_export_double_point_value(self):
161161

162162
handler = mock.Mock(spec=ocagent.ExportRpcHandler)
163163
ocagent.StatsExporter(handler).export_metrics(view_data)
164-
self.assertEquals(
164+
self.assertEqual(
165165
handler.send.call_args[0]
166166
[0].metrics[0].timeseries[0].points[0].double_value, 2.5)
167167

@@ -185,7 +185,7 @@ def test_export_exemplar(self):
185185
handler = mock.Mock(spec=ocagent.ExportRpcHandler)
186186
ocagent.StatsExporter(handler).export_metrics([metric])
187187

188-
self.assertEquals(
188+
self.assertEqual(
189189
handler.send.call_args[0][0].metrics[0].timeseries[0].points[0].
190190
distribution_value.buckets[0].exemplar,
191191
metrics_pb2.DistributionValue.Exemplar(
@@ -323,8 +323,8 @@ def _helper(request_iterator, context):
323323
handler.send(request)
324324

325325
self.assertTrue(event.wait(timeout=1))
326-
self.assertEquals(len(initialized), 2)
327-
self.assertEquals(len(requests), 2)
326+
self.assertEqual(len(initialized), 2)
327+
self.assertEqual(len(requests), 2)
328328

329329
@mock.patch('opencensus.metrics.transport.get_exporter_thread')
330330
def test_create_stats_exporter_initialization(self, mock_transport):
@@ -358,7 +358,7 @@ def _helper(request_iterator, context):
358358
def test_create_stats_exporter_with_default_endpoint(
359359
self, mock_channel, _):
360360
ocagent.new_stats_exporter(SERVICE_NAME)
361-
self.assertEquals(mock_channel.call_args[0][0], 'localhost:55678')
361+
self.assertEqual(mock_channel.call_args[0][0], 'localhost:55678')
362362

363363
def test_export_node(self):
364364
requests = []

nox.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,14 @@ def _install_dev_packages(session):
4545
session.install('-e', 'contrib/opencensus-ext-google-cloud-clientlibs')
4646

4747

48+
def _install_test_dependencies(session):
49+
session.install('mock')
50+
session.install('pytest')
51+
session.install('pytest-cov')
52+
session.install('retrying')
53+
session.install('unittest2')
54+
55+
4856
@nox.session
4957
@nox.parametrize('py', ['2.7', '3.4', '3.5', '3.6'])
5058
def unit(session, py):
@@ -53,8 +61,8 @@ def unit(session, py):
5361
# Run unit tests against all supported versions of Python.
5462
session.interpreter = 'python{}'.format(py)
5563

56-
# Install all test dependencies.
57-
session.install('-r', 'requirements-test.txt')
64+
# Install test dependencies.
65+
_install_test_dependencies(session)
5866

5967
# Install dev packages.
6068
_install_dev_packages(session)
@@ -92,8 +100,8 @@ def system(session, py):
92100
# Set the virtualenv dirname.
93101
session.virtualenv_dirname = 'sys-' + py
94102

95-
# Install all test dependencies.
96-
session.install('-r', 'requirements-test.txt')
103+
# Install test dependencies.
104+
_install_test_dependencies(session)
97105

98106
# Install dev packages into the virtualenv's dist-packages.
99107
_install_dev_packages(session)

requirements-test.txt

Lines changed: 0 additions & 5 deletions
This file was deleted.

tests/unit/common/monitored_resource_util/test_aws_identity_doc_utils.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,15 @@ def test_get_aws_metadata(self, http_request_mock):
4848
labels_list = aws_identity_doc_utils.AwsIdentityDocumentUtils(
4949
).get_aws_metadata()
5050

51-
self.assertEquals(len(labels_list), 3)
51+
self.assertEqual(len(labels_list), 3)
5252

5353
expected_labels = {
5454
'instance_id': 'i-1234567890abcdef0',
5555
'aws_account': '123456789012',
5656
'region': 'us-west-2'
5757
}
5858

59-
self.assertEquals(labels_list, expected_labels)
59+
self.assertEqual(labels_list, expected_labels)
6060

6161
@mock.patch('opencensus.common.monitored_resource.'
6262
'aws_identity_doc_utils.get_request')
@@ -85,14 +85,14 @@ def test_get_aws_metadata_none_fields(self, http_request_mock):
8585
labels_list = aws_identity_doc_utils.AwsIdentityDocumentUtils(
8686
).get_aws_metadata()
8787

88-
self.assertEquals(len(labels_list), 2)
88+
self.assertEqual(len(labels_list), 2)
8989

9090
expected_labels = {
9191
'aws_account': '123456789012',
9292
'region': 'us-west-2'
9393
}
9494

95-
self.assertEquals(labels_list, expected_labels)
95+
self.assertEqual(labels_list, expected_labels)
9696

9797
@mock.patch('opencensus.common.monitored_resource.'
9898
'aws_identity_doc_utils.get_request')
@@ -108,4 +108,4 @@ def test_aws_not_running(self, http_request_mock):
108108
labels_list = aws_identity_doc_utils.AwsIdentityDocumentUtils(
109109
).get_aws_metadata()
110110

111-
self.assertEquals(len(labels_list), 0)
111+
self.assertEqual(len(labels_list), 0)

tests/unit/common/monitored_resource_util/test_gcp_metadata_config.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def assign_attribute_value(*args, **kwargs):
4444
labels_list = gcp_metadata_config.GcpMetadataConfig().get_gce_metadata(
4545
)
4646

47-
self.assertEquals(len(labels_list), 3)
47+
self.assertEqual(len(labels_list), 3)
4848

4949
expected_labels = {
5050
'instance_id': 'my-instance',
@@ -81,7 +81,7 @@ def assign_attribute_value(*args, **kwargs):
8181
labels_list = gcp_metadata_config.GcpMetadataConfig().get_gce_metadata(
8282
)
8383

84-
self.assertEquals(len(labels_list), 3)
84+
self.assertEqual(len(labels_list), 3)
8585

8686
expected_labels = {
8787
'instance_id': 'my-instance',
@@ -103,5 +103,5 @@ def test_gcp_not_running(self, http_request_mock):
103103
self.assertFalse(
104104
gcp_metadata_config.GcpMetadataConfig.is_running_on_gcp())
105105

106-
self.assertEquals(
106+
self.assertEqual(
107107
len(gcp_metadata_config.GcpMetadataConfig().get_gce_metadata()), 0)

tests/unit/trace/test_blank_span.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,4 +172,4 @@ def test_context_manager(self):
172172
span_name = 'root_span'
173173
with self._make_one(span_name) as s:
174174
self.assertIsNotNone(s)
175-
self.assertEquals(s.name, span_name)
175+
self.assertEqual(s.name, span_name)

tox.ini

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)