Skip to content

Commit

Permalink
update format for integration tests
Browse files Browse the repository at this point in the history
  • Loading branch information
taddes committed Aug 11, 2024
1 parent 12928b8 commit 3f555b7
Show file tree
Hide file tree
Showing 9 changed files with 820 additions and 993 deletions.
14 changes: 6 additions & 8 deletions tools/integration_tests/run.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
#!/usr/bin/env python3

import os.path
import psutil
import signal
import subprocess
import sys
import time

import psutil
from test_storage import TestStorage
from test_support import run_live_functional_tests
import time
from tokenserver.run import (run_end_to_end_tests, run_local_tests)
from tokenserver.run import run_end_to_end_tests, run_local_tests

DEBUG_BUILD = "target/debug/syncserver"
RELEASE_BUILD = "/app/bin/syncserver"
Expand Down Expand Up @@ -37,9 +38,7 @@ def terminate_process(process):
)

def start_server():
the_server_subprocess = subprocess.Popen(
target_binary, shell=True, env=os.environ
)
the_server_subprocess = subprocess.Popen(target_binary, shell=True, env=os.environ)

# TODO we should change this to watch for a log message on startup
# to know when to continue instead of sleeping for a fixed amount
Expand All @@ -62,8 +61,7 @@ def start_server():
finally:
terminate_process(the_server_subprocess)

os.environ["SYNC_TOKENSERVER__FXA_OAUTH_SERVER_URL"] = \
"https://oauth.stage.mozaws.net"
os.environ["SYNC_TOKENSERVER__FXA_OAUTH_SERVER_URL"] = "https://oauth.stage.mozaws.net"
the_server_subprocess = start_server()
try:
res |= run_end_to_end_tests()
Expand Down
Loading

0 comments on commit 3f555b7

Please sign in to comment.