Skip to content

Add Try/Except around imporlib.reload for unit test to run in python2.7 as well as 3.4+ #949

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 23, 2021
Merged

Add Try/Except around imporlib.reload for unit test to run in python2.7 as well as 3.4+ #949

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
09ee452
Allow test to run in both python 2.7 and python 3.3+ wrt reloading mo…
avrata Apr 21, 2021
ddf2515
Update tests/test_plugin_detection.py comment
avrata Apr 23, 2021
92561bb
Update tests/test_plugin_detection.py comment
avrata Apr 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions tests/test_plugin_detection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import os
import pkg_resources
import sys
import importlib

try:
# Python 3.3 forward includes the mock module
Expand All @@ -41,6 +40,12 @@
# Mock appears to not be installed
could_import_mock = False

try:
# Python3: use importlib.reload
from importlib import reload as import_reload
except ImportError:
# Python2:
from imp import reload as import_reload

import opentimelineio as otio
from tests import baseline_reader
Expand Down Expand Up @@ -102,7 +107,7 @@ def test_detect_plugin(self):

def test_pkg_resources_disabled(self):
os.environ["OTIO_DISABLE_PKG_RESOURCE_PLUGINS"] = "1"
importlib.reload(otio.plugins.manifest)
import_reload(otio.plugins.manifest)

# detection of the environment variable happens on import, force a
# reload to ensure that it is triggered
Expand All @@ -112,7 +117,7 @@ def test_pkg_resources_disabled(self):
# remove the environment variable and reload again for usage in the
# other tests
del os.environ["OTIO_DISABLE_PKG_RESOURCE_PLUGINS"]
importlib.reload(otio.plugins.manifest)
import_reload(otio.plugins.manifest)

def test_detect_plugin_json_manifest(self):
# Test detecting a plugin that rather than exposing the plugin_manifest
Expand Down