tools: Extract get_provisioning_status check logic.

Move get_provisioning_status check logic into
assert_provisioning_status_ok and use it instead of duplicating the
check code.
This commit is contained in:
Aman Agrawal
2019-06-20 21:57:09 +05:30
committed by Tim Abbott
parent 80a3651cf3
commit b2b49089fd
9 changed files with 27 additions and 56 deletions

View File

@@ -14,7 +14,7 @@ os.chdir(ZULIP_PATH)
from zulip import Client
from tools.lib.test_script import get_provisioning_status
from tools.lib.test_script import assert_provisioning_status_ok
from tools.lib.test_server import test_server_running
from zerver.lib.api_test_helpers import test_the_api, test_invalid_api_key
@@ -31,12 +31,7 @@ parser.add_argument('--force', dest='force',
default=False, help='Run tests despite possible provisioning problems.')
options = parser.parse_args()
if not options.force:
ok, msg = get_provisioning_status()
if not ok:
print(msg)
print('If you really know what you are doing, use --force to run anyway.')
sys.exit(1)
assert_provisioning_status_ok(options.force)
with test_server_running(force=options.force, external_host='zulipdev.com:9981'):
print("Running API tests...")