Skip to content
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.

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

testing env support #288

Merged
merged 6 commits into from
Oct 7, 2022
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
3 changes: 2 additions & 1 deletion integration_tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,5 @@ def dev_session():
process = spawn_process(command)
time.sleep(5)
yield
kill_process(process)
kill_process(process)

32 changes: 32 additions & 0 deletions integration_tests/test_env_populator.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# from integration_tests.conftest import test_session
from robyn.env_populator import load_vars, parser
import pathlib
import os
import pytest
import requests



path = pathlib.Path(__file__).parent

#create robyn.env before test and delete it after test
@pytest.fixture
def env_file():
CONTENT = "ROBYN_PORT=8080" + "\n" + "ROBYN_URL=127.0.1.1"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can use python multiline strings(https://www.w3schools.com/python/gloss_python_multi_line_strings.asp) here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

dir = path / "test_dir"
env_file = dir / "robyn.env"
env_file.write_text(CONTENT)
yield
env_file.unlink()
sansyrox marked this conversation as resolved.
Show resolved Hide resolved
os.unsetenv("PORT")
sansyrox marked this conversation as resolved.
Show resolved Hide resolved

sansyrox marked this conversation as resolved.
Show resolved Hide resolved
# this tests if a connection can be made to the server with the correct port imported from the env file
def test_env_population(dev_session, env_file):
dir = path / "test_dir"
env_file = dir / "robyn.env"
load_vars(variables = parser(config_path = env_file))
PORT = os.environ['ROBYN_PORT']
HOST = os.environ['ROBYN_URL']
BASE_URL = f"http://{HOST}:{PORT}"
res = requests.get(f"{BASE_URL}")
assert res.status_code == 200
6 changes: 2 additions & 4 deletions robyn/env_populator.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,8 @@ def parser(config_path=CONFIG_PATH):
def load_vars(variables = None):
"""Main function"""

variables = parser()

if variables is None:
return
variables = parser()

for var in variables:
if var[0] in os.environ:
Expand All @@ -43,6 +41,6 @@ def load_vars(variables = None):
logger.info(f" Variable {var[0]} set to {var[1]}")





31 changes: 31 additions & 0 deletions unit_tests/test_env_pop.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
from robyn.env_populator import load_vars, parser
import pathlib
import os
import pytest




path = pathlib.Path(__file__).parent

#create robyn.env before test and delete it after test
@pytest.fixture
def env_file():
CONTENT = "PORT=8080"
dir = path / "test_dir"
env_file = dir / "robyn.env"
env_file.write_text(CONTENT)
yield
env_file.unlink()
os.unsetenv("PORT")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be ROBYN_PORT and ROBYN_URL now


def test_parser(env_file):
dir = path / "test_dir"
env_file = dir / "robyn.env"
assert list(parser(config_path = env_file)) == [['PORT', '8080']]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here


def test_load_vars(env_file):
dir = path / "test_dir"
env_file = dir / "robyn.env"
load_vars(variables = parser(config_path = env_file))
assert os.environ['PORT'] == '8080'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done