mirror of
https://github.com/ChristianLight/tutor.git
synced 2024-11-13 08:46:34 +00:00
728ef966dc
- 💥[Improvement] Upgrade Open edX to Koa - 💥 Setting changes: - The ``ACTIVATE_HTTPS`` setting was renamed to ``ENABLE_HTTPS``. - Other ``ACTIVATE_*`` variables were all renamed to ``RUN_*``. - The ``WEB_PROXY`` setting was removed and ``RUN_CADDY`` was added. - The ``NGINX_HTTPS_PORT`` setting is deprecated. - Architectural changes: - Use Caddy as a web proxy for automated SSL/TLS certificate generation: - Nginx no longer listens to port 443 for https traffic - The Caddy configuration file comes with a new ``caddyfile`` patch for much simpler SSL/TLS management. - Configuration files for web proxies are no longer provided. - Kubernetes deployment no longer requires setting up a custom Ingress resource or custom manager. - Gunicorn and Whitenoise are replaced by uwsgi: this increases boostrap performance and makes it no longer necessary to mount media folders in the Nginx container. - Replace memcached and rabbitmq by redis. - Additional features: - Make it possible to disable all plugins at once with ``plugins disable all``. - Add ``tutor k8s wait`` command to wait for a pod to become ready - Faster, more reliable static assets with local memory caching - Deprecation: proxy files for Apache and Nginx are no longer provided out of the box. - Removed plugin `{{ patch (...) }}` statements: - "https-create", "k8s-ingress-rules", "k8s-ingress-tls-hosts": these are no longer necessary. Instead, declare your app in the "caddyfile" patch. - "local-docker-compose-nginx-volumes": this patch was primarily used to serve media assets. The recommended is now to serve assets with uwsgi.
183 lines
7.1 KiB
Python
183 lines
7.1 KiB
Python
import os
|
|
import tempfile
|
|
import unittest
|
|
import unittest.mock
|
|
|
|
from tutor import config as tutor_config
|
|
from tutor import env
|
|
from tutor import fmt
|
|
from tutor import exceptions
|
|
|
|
|
|
class EnvTests(unittest.TestCase):
|
|
def setUp(self):
|
|
env.Renderer.reset()
|
|
|
|
def test_walk_templates(self):
|
|
renderer = env.Renderer({}, [env.TEMPLATES_ROOT])
|
|
templates = list(renderer.walk_templates("local"))
|
|
self.assertIn("local/docker-compose.yml", templates)
|
|
|
|
def test_walk_templates_partials_are_ignored(self):
|
|
template_name = "apps/openedx/settings/partials/common_all.py"
|
|
renderer = env.Renderer({}, [env.TEMPLATES_ROOT], ignore_folders=["partials"])
|
|
templates = list(renderer.walk_templates("apps"))
|
|
self.assertIn(template_name, renderer.environment.loader.list_templates())
|
|
self.assertNotIn(template_name, templates)
|
|
|
|
def test_is_binary_file(self):
|
|
self.assertTrue(env.is_binary_file("/home/somefile.ico"))
|
|
|
|
def test_find_os_path(self):
|
|
renderer = env.Renderer({}, [env.TEMPLATES_ROOT])
|
|
path = renderer.find_os_path("local/docker-compose.yml")
|
|
self.assertTrue(os.path.exists(path))
|
|
|
|
def test_pathjoin(self):
|
|
self.assertEqual(
|
|
"/tmp/env/target/dummy", env.pathjoin("/tmp", "target", "dummy")
|
|
)
|
|
self.assertEqual("/tmp/env/dummy", env.pathjoin("/tmp", "dummy"))
|
|
|
|
def test_render_str(self):
|
|
self.assertEqual(
|
|
"hello world", env.render_str({"name": "world"}, "hello {{ name }}")
|
|
)
|
|
|
|
def test_common_domain(self):
|
|
self.assertEqual(
|
|
"mydomain.com",
|
|
env.render_str(
|
|
{"d1": "d1.mydomain.com", "d2": "d2.mydomain.com"},
|
|
"{{ d1|common_domain(d2) }}",
|
|
),
|
|
)
|
|
|
|
def test_render_str_missing_configuration(self):
|
|
self.assertRaises(exceptions.TutorError, env.render_str, {}, "hello {{ name }}")
|
|
|
|
def test_render_file(self):
|
|
config = {}
|
|
tutor_config.merge(config, tutor_config.load_defaults())
|
|
config["MYSQL_ROOT_PASSWORD"] = "testpassword"
|
|
rendered = env.render_file(config, "hooks", "mysql", "init")
|
|
self.assertIn("testpassword", rendered)
|
|
|
|
@unittest.mock.patch.object(tutor_config.fmt, "echo")
|
|
def test_render_file_missing_configuration(self, _):
|
|
self.assertRaises(
|
|
exceptions.TutorError, env.render_file, {}, "local", "docker-compose.yml"
|
|
)
|
|
|
|
def test_save_full(self):
|
|
defaults = tutor_config.load_defaults()
|
|
with tempfile.TemporaryDirectory() as root:
|
|
config = tutor_config.load_current(root, defaults)
|
|
tutor_config.merge(config, defaults)
|
|
with unittest.mock.patch.object(fmt, "STDOUT"):
|
|
env.save(root, config)
|
|
self.assertTrue(
|
|
os.path.exists(os.path.join(root, "env", "local", "docker-compose.yml"))
|
|
)
|
|
|
|
def test_save_full_with_https(self):
|
|
defaults = tutor_config.load_defaults()
|
|
with tempfile.TemporaryDirectory() as root:
|
|
config = tutor_config.load_current(root, defaults)
|
|
tutor_config.merge(config, defaults)
|
|
config["ENABLE_HTTPS"] = True
|
|
with unittest.mock.patch.object(fmt, "STDOUT"):
|
|
env.save(root, config)
|
|
with open(os.path.join(root, "env", "apps", "caddy", "Caddyfile")) as f:
|
|
self.assertIn("www.myopenedx.com {", f.read())
|
|
|
|
def test_patch(self):
|
|
patches = {"plugin1": "abcd", "plugin2": "efgh"}
|
|
with unittest.mock.patch.object(
|
|
env.plugins, "iter_patches", return_value=patches.items()
|
|
) as mock_iter_patches:
|
|
rendered = env.render_str({}, '{{ patch("location") }}')
|
|
mock_iter_patches.assert_called_once_with({}, "location")
|
|
self.assertEqual("abcd\nefgh", rendered)
|
|
|
|
def test_patch_separator_suffix(self):
|
|
patches = {"plugin1": "abcd", "plugin2": "efgh"}
|
|
with unittest.mock.patch.object(
|
|
env.plugins, "iter_patches", return_value=patches.items()
|
|
):
|
|
rendered = env.render_str(
|
|
{}, '{{ patch("location", separator=",\n", suffix=",") }}'
|
|
)
|
|
self.assertEqual("abcd,\nefgh,", rendered)
|
|
|
|
def test_plugin_templates(self):
|
|
with tempfile.TemporaryDirectory() as plugin_templates:
|
|
# Create plugin
|
|
plugin1 = env.plugins.DictPlugin(
|
|
{"name": "plugin1", "version": "0", "templates": plugin_templates}
|
|
)
|
|
|
|
# Create two templates
|
|
os.makedirs(os.path.join(plugin_templates, "plugin1", "apps"))
|
|
with open(
|
|
os.path.join(plugin_templates, "plugin1", "unrendered.txt"), "w"
|
|
) as f:
|
|
f.write("This file should not be rendered")
|
|
with open(
|
|
os.path.join(plugin_templates, "plugin1", "apps", "rendered.txt"), "w"
|
|
) as f:
|
|
f.write("Hello my ID is {{ ID }}")
|
|
|
|
# Create configuration
|
|
config = {"ID": "abcd"}
|
|
|
|
# Render templates
|
|
with unittest.mock.patch.object(
|
|
env.plugins,
|
|
"iter_enabled",
|
|
return_value=[plugin1],
|
|
):
|
|
with tempfile.TemporaryDirectory() as root:
|
|
# Render plugin templates
|
|
env.save_plugin_templates(plugin1, root, config)
|
|
|
|
# Check that plugin template was rendered
|
|
dst_unrendered = os.path.join(
|
|
root, "env", "plugins", "plugin1", "unrendered.txt"
|
|
)
|
|
dst_rendered = os.path.join(
|
|
root, "env", "plugins", "plugin1", "apps", "rendered.txt"
|
|
)
|
|
self.assertFalse(os.path.exists(dst_unrendered))
|
|
self.assertTrue(os.path.exists(dst_rendered))
|
|
with open(dst_rendered) as f:
|
|
self.assertEqual("Hello my ID is abcd", f.read())
|
|
|
|
def test_renderer_is_reset_on_config_change(self):
|
|
with tempfile.TemporaryDirectory() as plugin_templates:
|
|
plugin1 = env.plugins.DictPlugin(
|
|
{"name": "plugin1", "version": "0", "templates": plugin_templates}
|
|
)
|
|
# Create one template
|
|
os.makedirs(os.path.join(plugin_templates, plugin1.name))
|
|
with open(
|
|
os.path.join(plugin_templates, plugin1.name, "myplugin.txt"), "w"
|
|
) as f:
|
|
f.write("some content")
|
|
|
|
# Load env once
|
|
config = {"PLUGINS": []}
|
|
env1 = env.Renderer.instance(config).environment
|
|
|
|
with unittest.mock.patch.object(
|
|
env.plugins,
|
|
"iter_enabled",
|
|
return_value=[plugin1],
|
|
):
|
|
# Load env a second time
|
|
config["PLUGINS"].append("myplugin")
|
|
env2 = env.Renderer.instance(config).environment
|
|
|
|
self.assertNotIn("plugin1/myplugin.txt", env1.loader.list_templates())
|
|
self.assertIn("plugin1/myplugin.txt", env2.loader.list_templates())
|