Remove WebRTC usage of //third_party/pymock
Removes usage of Chromium's //third_party/pymock in favor of the version provided by vpython. This is so that the third_party version can eventually be removed. TBR=aleloi@webrtc.org Bug: chromium:1094489 Change-Id: I68511e11ed1e517c2b6d3bb832090a3c27e480e5 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/177921 Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Alex Loiko <aleloi@google.com> Cr-Commit-Position: refs/heads/master@{#31568}
This commit is contained in:
@ -9,14 +9,9 @@
|
||||
"""Unit tests for the apm_quality_assessment module.
|
||||
"""
|
||||
|
||||
import os
|
||||
import sys
|
||||
import unittest
|
||||
|
||||
SRC = os.path.abspath(os.path.join(
|
||||
os.path.dirname((__file__)), os.pardir, os.pardir, os.pardir))
|
||||
sys.path.append(os.path.join(SRC, 'third_party', 'pymock'))
|
||||
|
||||
import mock
|
||||
|
||||
import apm_quality_assessment
|
||||
|
@ -12,14 +12,9 @@
|
||||
import logging
|
||||
import os
|
||||
import shutil
|
||||
import sys
|
||||
import tempfile
|
||||
import unittest
|
||||
|
||||
SRC = os.path.abspath(os.path.join(
|
||||
os.path.dirname((__file__)), os.pardir, os.pardir, os.pardir, os.pardir))
|
||||
sys.path.append(os.path.join(SRC, 'third_party', 'pymock'))
|
||||
|
||||
import mock
|
||||
|
||||
from . import exceptions
|
||||
|
@ -12,14 +12,9 @@
|
||||
import logging
|
||||
import os
|
||||
import shutil
|
||||
import sys
|
||||
import tempfile
|
||||
import unittest
|
||||
|
||||
SRC = os.path.abspath(os.path.join(
|
||||
os.path.dirname((__file__)), os.pardir, os.pardir, os.pardir, os.pardir))
|
||||
sys.path.append(os.path.join(SRC, 'third_party', 'pymock'))
|
||||
|
||||
import mock
|
||||
import pydub
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env python
|
||||
#!/usr/bin/env vpython
|
||||
# Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
|
||||
#
|
||||
# Use of this source code is governed by a BSD-style license
|
||||
@ -24,8 +24,6 @@ from roll_deps import CalculateChangedDeps, FindAddedDeps, \
|
||||
GetMatchingDepsEntries, ParseDepsDict, ParseLocalDepsFile, UpdateDepsFile, \
|
||||
ChromiumRevisionUpdate
|
||||
|
||||
SRC_DIR = os.path.join(PARENT_DIR, os.pardir, os.pardir)
|
||||
sys.path.append(os.path.join(SRC_DIR, 'third_party', 'pymock'))
|
||||
import mock
|
||||
|
||||
TEST_DATA_VARS = {
|
||||
|
@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env python
|
||||
#!/usr/bin/env vpython
|
||||
# pylint: disable=relative-import,protected-access,unused-argument
|
||||
|
||||
# Copyright 2017 The WebRTC project authors. All Rights Reserved.
|
||||
@ -9,13 +9,6 @@
|
||||
# in the file PATENTS. All contributing project authors may
|
||||
# be found in the AUTHORS file in the root of the source tree.
|
||||
|
||||
import os
|
||||
import sys
|
||||
|
||||
SRC = os.path.abspath(
|
||||
os.path.join(os.path.dirname((__file__)), os.pardir, os.pardir))
|
||||
sys.path.append(os.path.join(SRC, 'third_party', 'pymock'))
|
||||
|
||||
import unittest
|
||||
import mock
|
||||
|
||||
|
Reference in New Issue
Block a user