Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename tools/lib/api_tests.py to zerver/lib/api_test_helpers.py. 

Now that the Markdown extension defined in
zerver/lib/bugdown/api_generate_examples depended on code in the
tools/lib/* directory, it caused the production tests to fail since
the tools/ directory wouldn't exist in a production environment.
This commit is contained in:
Eeshan Garg 2018-01-26 18:10:39 -03:30 committed by showell
parent a1a69a0ac2
commit c158869096
4 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/test-api
View File

@ -14,7 +14,7 @@ os.chdir(ZULIP_PATH)
from zulip import Client from zulip import Client
from tools.lib.test_server import test_server_running from tools.lib.test_server import test_server_running
from tools.lib.api_tests import test_the_api from zerver.lib.api_test_helpers import test_the_api
os.environ['DJANGO_SETTINGS_MODULE'] = 'zproject.test_settings' os.environ['DJANGO_SETTINGS_MODULE'] = 'zproject.test_settings'
django.setup() django.setup()

1
tools/test-backend
View File

@ -107,6 +107,7 @@ not_yet_fully_covered = {
'zerver/lib/statistics.py', 'zerver/lib/statistics.py',
'zerver/lib/test_fixtures.py', 'zerver/lib/test_fixtures.py',
'zerver/lib/test_runner.py', 'zerver/lib/test_runner.py',
'zerver/lib/api_test_helpers.py',
# Webhook integrations with incomplete coverage # Webhook integrations with incomplete coverage
'zerver/webhooks/basecamp/view.py', 'zerver/webhooks/basecamp/view.py',
'zerver/webhooks/beanstalk/view.py', 'zerver/webhooks/beanstalk/view.py',

0
tools/lib/api_tests.py → zerver/lib/api_test_helpers.py
View File

10
zerver/lib/bugdown/api_code_examples.py
View File

@ -9,11 +9,7 @@ from markdown.preprocessors import Preprocessor
from typing import Any, Dict, Optional, List from typing import Any, Dict, Optional, List
import markdown import markdown
ZULIP_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))) import zerver.lib.api_test_helpers
TOOLS_DIR = os.path.join(ZULIP_DIR, 'tools', 'lib')
sys.path.insert(0, TOOLS_DIR)
import api_tests
REGEXP = re.compile(r'\{generate_code_example\|\s*(.+?)\s*\|\s*(.+?)\s*\}') REGEXP = re.compile(r'\{generate_code_example\|\s*(.+?)\s*\|\s*(.+?)\s*\}')
@ -72,7 +68,7 @@ class APICodeExamplesPreprocessor(Preprocessor):
def render_fixture(self, function: str) -> List[str]: def render_fixture(self, function: str) -> List[str]:
fixture = [] fixture = []
fixture_dict = api_tests.FIXTURES[function] fixture_dict = zerver.lib.api_test_helpers.FIXTURES[function]
fixture_json = ujson.dumps(fixture_dict, indent=4, sort_keys=True) fixture_json = ujson.dumps(fixture_dict, indent=4, sort_keys=True)
fixture.append('```') fixture.append('```')
@ -82,7 +78,7 @@ class APICodeExamplesPreprocessor(Preprocessor):
return fixture return fixture
def render_code_example(self, function: str) -> List[str]: def render_code_example(self, function: str) -> List[str]:
method = api_tests.TEST_FUNCTIONS[function] method = zerver.lib.api_test_helpers.TEST_FUNCTIONS[function]
function_source_lines = inspect.getsourcelines(method)[0] function_source_lines = inspect.getsourcelines(method)[0]
ce_regex = re.compile(r'\# \{code_example\|\s*(.+?)\s*\}') ce_regex = re.compile(r'\# \{code_example\|\s*(.+?)\s*\}')