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

Commit 99821a0

Browse files
authored
Rename long named tests + refactor tox/nox (#868)
1 parent bb02e5b commit 99821a0

File tree

4 files changed

+53
-50
lines changed

4 files changed

+53
-50
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
ignore:
1111
- gh-pages
1212
docker:
13-
- image: googleapis/nox:0.17.0
13+
- image: googleapis/nox:0.18.2
1414
- image: mysql:5.7
1515
environment:
1616
MYSQL_ROOT_HOST: "%"

contrib/opencensus-ext-azure/tests/test_azure_trace_exporter.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -745,7 +745,7 @@ def test_transmission_nothing(self):
745745
exporter._transmit_from_storage()
746746
exporter._stop()
747747

748-
def test_transmission_request_exception(self):
748+
def test_transmission_pre_exception(self):
749749
exporter = trace_exporter.AzureExporter(
750750
instrumentation_key='12345678-1234-5678-abcd-12345678abcd',
751751
storage_path=os.path.join(TEST_FOLDER, self.id()),
@@ -771,7 +771,7 @@ def test_transmission_lease_failure(self, requests_mock):
771771
self.assertTrue(exporter.storage.get())
772772
exporter._stop()
773773

774-
def test_transmission_response_exception(self):
774+
def test_transmission_exception(self):
775775
exporter = trace_exporter.AzureExporter(
776776
instrumentation_key='12345678-1234-5678-abcd-12345678abcd',
777777
storage_path=os.path.join(TEST_FOLDER, self.id()),
@@ -840,7 +840,7 @@ def test_transmission_206_500(self):
840840
self.assertEqual(exporter.storage.get().get(), (3,))
841841
exporter._stop()
842842

843-
def test_transmission_206_nothing_to_retry(self):
843+
def test_transmission_206_no_retry(self):
844844
exporter = trace_exporter.AzureExporter(
845845
instrumentation_key='12345678-1234-5678-abcd-12345678abcd',
846846
storage_path=os.path.join(TEST_FOLDER, self.id()),

noxfile.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def _install_dev_packages(session):
5050

5151

5252
def _install_test_dependencies(session):
53-
session.install('mock')
53+
session.install('mock==3.0.5')
5454
session.install('pytest==4.6.4')
5555
# 842 - Unit tests failing on CI due to failed import for coverage
5656
# Might have something to do with the CircleCI image
@@ -59,7 +59,7 @@ def _install_test_dependencies(session):
5959
session.install('unittest2')
6060

6161

62-
@nox.session(python=['2.7', '3.4', '3.5', '3.6'])
62+
@nox.session(python=['2.7', '3.5', '3.6'])
6363
def unit(session):
6464
"""Run the unit test suite."""
6565

tox.ini

Lines changed: 47 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,58 @@
11
[tox]
2-
envlist = py{27,34,35,36,37}-unit, py37-lint, py37-setup, py37-docs
2+
envlist =
3+
py{27,34,35,36,37}-unit
4+
py37-lint
5+
py37-setup
6+
py37-docs
37

48
[testenv]
59
install_command = python -m pip install {opts} {packages}
610

711
deps =
8-
py{27,34,35,36,37}-unit,py37-lint: mock
9-
py{27,34,35,36,37}-unit,py37-lint: pytest==4.6.4
10-
py{27,34,35,36,37}-unit,py37-lint: pytest-cov
11-
py{27,34,35,36,37}-unit,py37-lint: retrying
12-
py{27,34,35,36,37}-unit,py37-lint: unittest2
13-
py{27,34,35,36,37}-unit,py37-lint,py37-setup,py37-docs: -e context/opencensus-context
14-
py{27,34,35,36,37}-unit,py37-lint,py37-docs: -e contrib/opencensus-correlation
15-
py{27,34,35,36,37}-unit,py37-lint,py37-docs: -e .
16-
py{27,34,35,36,37}-unit,py37-lint: -e contrib/opencensus-ext-azure
17-
py{27,34,35,36,37}-unit,py37-lint: -e contrib/opencensus-ext-datadog
18-
py{27,34,35,36,37}-unit,py37-lint: -e contrib/opencensus-ext-dbapi
19-
py{27,34,35,36,37}-unit,py37-lint: -e contrib/opencensus-ext-django
20-
py{27,34,35,36,37}-unit,py37-lint: -e contrib/opencensus-ext-flask
21-
py{27,34,35,36,37}-unit,py37-lint: -e contrib/opencensus-ext-gevent
22-
py{27,34,35,36,37}-unit,py37-lint: -e contrib/opencensus-ext-grpc
23-
py{27,34,35,36,37}-unit,py37-lint: -e contrib/opencensus-ext-httplib
24-
py{27,34,35,36,37}-unit,py37-lint: -e contrib/opencensus-ext-jaeger
25-
py{27,34,35,36,37}-unit,py37-lint: -e contrib/opencensus-ext-logging
26-
py{27,34,35,36,37}-unit,py37-lint: -e contrib/opencensus-ext-mysql
27-
py{27,34,35,36,37}-unit,py37-lint: -e contrib/opencensus-ext-ocagent
28-
py{27,34,35,36,37}-unit,py37-lint: -e contrib/opencensus-ext-postgresql
29-
py{27,34,35,36,37}-unit,py37-lint: -e contrib/opencensus-ext-prometheus
30-
py{27,34,35,36,37}-unit,py37-lint: -e contrib/opencensus-ext-pymongo
31-
py{27,34,35,36,37}-unit,py37-lint: -e contrib/opencensus-ext-pymysql
32-
py{27,34,35,36,37}-unit,py37-lint: -e contrib/opencensus-ext-pyramid
33-
py{27,34,35,36,37}-unit,py37-lint: -e contrib/opencensus-ext-requests
34-
py{27,34,35,36,37}-unit,py37-lint: -e contrib/opencensus-ext-sqlalchemy
35-
py{27,34,35,36,37}-unit,py37-lint: -e contrib/opencensus-ext-stackdriver
36-
py{27,34,35,36,37}-unit,py37-lint: -e contrib/opencensus-ext-threading
37-
py{27,34,35,36,37}-unit,py37-lint: -e contrib/opencensus-ext-zipkin
38-
py{27,34,35,36,37}-unit,py37-lint: -e contrib/opencensus-ext-google-cloud-clientlibs
39-
py37-lint: flake8
40-
py37-setup: docutils
41-
py37-setup: pygments
42-
py37-docs: setuptools >= 36.4.0
43-
py37-docs: sphinx >= 1.6.3
44-
isort ~= 4.3.21
12+
unit,lint: mock==3.0.5
13+
unit,lint: pytest==4.6.4
14+
unit,lint: pytest-cov
15+
unit,lint: retrying
16+
unit,lint: unittest2
17+
unit,lint,py37-setup,docs: -e context/opencensus-context
18+
unit,lint,docs: -e contrib/opencensus-correlation
19+
unit,lint,docs: -e .
20+
unit,lint: -e contrib/opencensus-ext-azure
21+
unit,lint: -e contrib/opencensus-ext-datadog
22+
unit,lint: -e contrib/opencensus-ext-dbapi
23+
unit,lint: -e contrib/opencensus-ext-django
24+
unit,lint: -e contrib/opencensus-ext-flask
25+
unit,lint: -e contrib/opencensus-ext-gevent
26+
unit,lint: -e contrib/opencensus-ext-grpc
27+
unit,lint: -e contrib/opencensus-ext-httplib
28+
unit,lint: -e contrib/opencensus-ext-jaeger
29+
unit,lint: -e contrib/opencensus-ext-logging
30+
unit,lint: -e contrib/opencensus-ext-mysql
31+
unit,lint: -e contrib/opencensus-ext-ocagent
32+
unit,lint: -e contrib/opencensus-ext-postgresql
33+
unit,lint: -e contrib/opencensus-ext-prometheus
34+
unit,lint: -e contrib/opencensus-ext-pymongo
35+
unit,lint: -e contrib/opencensus-ext-pymysql
36+
unit,lint: -e contrib/opencensus-ext-pyramid
37+
unit,lint: -e contrib/opencensus-ext-requests
38+
unit,lint: -e contrib/opencensus-ext-sqlalchemy
39+
unit,lint: -e contrib/opencensus-ext-stackdriver
40+
unit,lint: -e contrib/opencensus-ext-threading
41+
unit,lint: -e contrib/opencensus-ext-zipkin
42+
unit,lint: -e contrib/opencensus-ext-google-cloud-clientlibs
43+
lint: flake8
44+
lint: isort ~= 4.3.21
45+
setup: docutils
46+
setup: pygments
47+
docs: setuptools >= 36.4.0
48+
docs: sphinx >= 1.6.3
4549

4650
commands =
47-
py{27,34,35,36,37}-unit: py.test --quiet --cov={envdir}/opencensus --cov=context --cov=contrib --cov-report term-missing --cov-config=.coveragerc --cov-fail-under=97 tests/unit/ context/ contrib/
48-
isort --check-only --diff --recursive .
49-
; TODO: System tests
50-
py37-lint: flake8 context/ contrib/ opencensus/ tests/ examples/
51-
py37-lint: - bash ./scripts/pylint.sh
51+
unit: py.test --quiet --cov={envdir}/opencensus --cov=context --cov=contrib --cov-report term-missing --cov-config=.coveragerc --cov-fail-under=97 tests/unit/ context/ contrib/
52+
; TODO system tests
53+
lint: isort --check-only --diff --recursive .
54+
lint: flake8 context/ contrib/ opencensus/ tests/ examples/
55+
lint: - bash ./scripts/pylint.sh
5256
py37-setup: python setup.py check --restructuredtext --strict
5357
py37-docs: bash ./scripts/update_docs.sh
5458
; TODO deployment
55-

0 commit comments

Comments
 (0)