paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-06 06:53:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

test_server: Improve warning in venv check.

Browse Source 
This (1) changes test_server to use the common `check_venv` method and
(2) improves check_venv to provide a clearer error message in the case
that you're inside Vagrant but not in a venv.

Tweaked by tabbott to borrow logic from run_dev.py.
This commit is contained in:
sinwar
2017-04-03 15:18:57 +05:30
committed by Tim Abbott
parent 22b36ff2dc
commit 4296d608ab
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/lib/sanity_check.py
View File

@@ -1,6 +1,8 @@
#!/usr/bin/env python
from __future__ import print_function
import os
import pwd
import sys
def check_venv(filename):
@@ -9,5 +11,10 @@ def check_venv(filename):
import ujson
except ImportError:
print("You need to run %s inside a Zulip dev environment." % (filename,))
print("If you are using Vagrant, you can `vagrant ssh` to enter the Vagrant guest.")
user_id = os.getuid()
user_name = pwd.getpwuid(user_id).pw_name
if user_name != 'vagrant' and user_name != 'zulipdev':
print("If you are using Vagrant, you can `vagrant ssh` to enter the Vagrant guest.")
else:
print("You can `source /srv/zulip-venv/bin/activate` to enter the Zulip development environment.")
sys.exit(1)