Browse Source

Merge "Do not require external mock on Python 3"

changes/26/788126/1 1.19.0
Zuul 2 weeks ago
committed by Gerrit Code Review
parent
commit
4ffa21de8d
2 changed files with 5 additions and 2 deletions
  1. +4
    -1
      glean/tests/test_glean.py
  2. +1
    -1
      test-requirements.txt

+ 4
- 1
glean/tests/test_glean.py View File

@ -17,8 +17,11 @@ import errno
import functools
import json
import os
try:
from unittest import mock
except ImportError:
import mock
import mock
from oslotest import base
from testscenarios import load_tests_apply_scenarios as load_tests # noqa


+ 1
- 1
test-requirements.txt View File

@ -5,7 +5,7 @@
hacking>=0.9.2,<0.10
coverage>=3.6
mock>=1.0
mock>=1.0;python_version=='2.7'
python-subunit
sphinx!=1.6.6,!=1.6.7,<2.0.0;python_version=='2.7'
sphinx!=1.6.6,!=1.6.7,!=2.1.0;python_version>='3.4'


Loading…
Cancel
Save