fix tests

itsbravestone · Nov 2, 2020 · bed4c37 · bed4c37
1 parent 075cef3
commit bed4c37
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 9 deletions.
diff --git a/tests/test_color_palettes_config.py b/tests/test_color_palettes_config.py
@@ -14,6 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import importlib
 import os
 from tempfile import TemporaryDirectory
 
@@ -44,9 +45,10 @@ def test_color_palettes_config(monkeypatch):
         # XXX (dano): CHARTIFY_CONFIG_DIR must end with /
         monkeypatch.setenv('CHARTIFY_CONFIG_DIR', os.path.join(tmp, ''))
 
-        # (re-)import options module to reload configuration
+        # reload modules to reload configuration
+        import chartify._core.options
         import chartify._core.colors
-        import importlib
+        importlib.reload(chartify._core.options)
         importlib.reload(chartify._core.colors)
 
         # Check that the expected palettes are loaded

diff --git a/tests/test_colors.py b/tests/test_colors.py
@@ -14,6 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import chartify
+import importlib
 import numpy as np
 
 
@@ -25,6 +26,9 @@ def test_color(self):
 
 class TestColorPalettes:
     def test_getitem(self):
+        # reload configuration
+        importlib.reload(chartify)
+
         palette = chartify.color_palettes['Category20']
         assert (isinstance(palette, chartify._core.colors.ColorPalette))
         assert (palette.name == 'Category20')

diff --git a/tests/test_colors_config.py b/tests/test_colors_config.py
@@ -14,6 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import importlib
 import os
 from tempfile import TemporaryDirectory
 
@@ -52,10 +53,13 @@ def test_colors_config(monkeypatch):
         # XXX (dano): CHARTIFY_CONFIG_DIR must end with /
         monkeypatch.setenv('CHARTIFY_CONFIG_DIR', os.path.join(tmp, ''))
 
-        # (re-)import options module to reload configuration
+        # reload modules to reload configuration
+        import chartify._core.options
         import chartify._core.colors
-        import importlib
+        import chartify._core.style
+        importlib.reload(chartify._core.options)
         importlib.reload(chartify._core.colors)
+
         import chartify._core.colour as colour
         assert colour.COLOR_NAME_TO_RGB['foo'] == (0, 100, 80)
         assert colour.COLOR_NAME_TO_RGB['bar'] == (25, 20, 20)

diff --git a/tests/test_examples.py b/tests/test_examples.py
@@ -16,9 +16,13 @@
 """Tests for `chartify` package."""
 
 import chartify
+import importlib
 
 
 def test_examples():
+    # reload configuration
+    importlib.reload(chartify)
+
     excluded_examples = ['chart_show']
     public_examples = [
         attr for attr in dir(chartify.examples) if

diff --git a/tests/test_options_config.py b/tests/test_options_config.py
@@ -14,6 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import importlib
 import os
 from tempfile import TemporaryDirectory
 
@@ -53,11 +54,10 @@ def test_options_config(monkeypatch):
         # XXX (dano): CHARTIFY_CONFIG_DIR must end with /
         monkeypatch.setenv('CHARTIFY_CONFIG_DIR', os.path.join(tmp, ''))
 
-        # (re-)import options module to reload configuration
+        # reload modules to reload configuration
         import chartify._core.options
-        import importlib
-        chartify = importlib.reload(chartify._core.options)
+        options = importlib.reload(chartify._core.options)
 
-        config = {key: chartify.options.get_option(key)
+        config = {key: options.options.get_option(key)
                   for key in EXPECTED_CONFIG}
         assert config == EXPECTED_CONFIG
diff --git a/tests/test_style_settings_config.py b/tests/test_style_settings_config.py
@@ -14,6 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import importlib
 import os
 from tempfile import TemporaryDirectory
 
@@ -34,8 +35,13 @@ def test_style_settings_config(monkeypatch):
         # XXX (dano): CHARTIFY_CONFIG_DIR must end with /
         monkeypatch.setenv('CHARTIFY_CONFIG_DIR', os.path.join(tmp, ''))
 
-        # Check that the expected style is loaded
+        # reload modules to reload configuration
+        import chartify._core.options
         import chartify._core.style
+        importlib.reload(chartify._core.options)
+        importlib.reload(chartify._core.style)
+
+        # Check that the expected style is loaded
         style = chartify._core.style.Style(None, '')
 
         import yaml