Commit b1e091ec authored by Brian Sheedy's avatar Brian Sheedy Committed by Commit Bot

Remove remaining uses of //third_party/pymock

Removes all the remaining uses of //third_party/pymock from the
following directories in favor of the version provided by vpython:

//chrome/installer/mac/signing/
//chrome/test/data/android/
//components/schema_org/

This is so that the third_party version can be removed.

Bug: 1094489
Change-Id: I3441c03b4af871dc3a7c0071f02c367a8839991a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2284045Reviewed-by: default avatarRobert Sesek <rsesek@chromium.org>
Reviewed-by: default avatarBecca Hughes <beccahughes@chromium.org>
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#786030}
parent 8d2f4a87
#!/usr/bin/env python #!/usr/bin/env vpython
# Copyright 2019 The Chromium Authors. All rights reserved. # Copyright 2019 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
......
...@@ -9,11 +9,5 @@ def import_mock(): ...@@ -9,11 +9,5 @@ def import_mock():
from unittest import mock from unittest import mock
return mock return mock
except: except:
import os.path
import sys
sys.path.append(
os.path.join(
os.path.dirname(__file__), os.path.join(*((os.pardir,) * 4)),
'third_party', 'pymock'))
import mock import mock
return mock return mock
...@@ -15,15 +15,12 @@ import sys ...@@ -15,15 +15,12 @@ import sys
import unittest import unittest
import upload_download_utils import upload_download_utils
THIS_DIR = os.path.abspath(os.path.dirname(__file__))
CHROMIUM_SRC = os.path.abspath(os.path.join(THIS_DIR, '..', '..', '..', '..'))
PYMOCK_PATH = os.path.join(
CHROMIUM_SRC, 'third_party', 'pymock')
sys.path.append(PYMOCK_PATH)
import mock import mock
from pyfakefs import fake_filesystem_unittest from pyfakefs import fake_filesystem_unittest
THIS_DIR = os.path.abspath(os.path.dirname(__file__))
def filter_all(f): def filter_all(f):
"""Filter everything through.""" """Filter everything through."""
......
#!/usr/bin/env vpython
# Copyright 2020 The Chromium Authors. All rights reserved. # Copyright 2020 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
...@@ -9,8 +10,6 @@ import generate_schema_org_code ...@@ -9,8 +10,6 @@ import generate_schema_org_code
from generate_schema_org_code import schema_org_id from generate_schema_org_code import schema_org_id
import os import os
SRC = os.path.join(os.path.dirname(__file__), os.path.pardir, os.path.pardir)
sys.path.append(os.path.join(SRC, 'third_party', 'pymock'))
import mock import mock
_current_dir = os.path.dirname(os.path.realpath(__file__)) _current_dir = os.path.dirname(os.path.realpath(__file__))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment