Wait for servers to run

master
Bob Mottram 2019-06-30 22:27:25 +01:00
parent 906e3de1de
commit bee4f185a2
1 changed files with 18 additions and 1 deletions

View File

@ -25,6 +25,9 @@ from posts import createPublicPost
from follow import followPerson from follow import followPerson
from follow import followerOfPerson from follow import followerOfPerson
testServerAliceRunning = False
testServerBobRunning = False
def testHttpsigBase(withDigest): def testHttpsigBase(withDigest):
print('testHttpsig(' + str(withDigest) + ')') print('testHttpsig(' + str(withDigest) + ')')
username='socrates' username='socrates'
@ -101,6 +104,8 @@ def createServerAlice(path: str,port: int):
createPublicPost(username, domain, https, "No wise fish would go anywhere without a porpoise", False, True) createPublicPost(username, domain, https, "No wise fish would go anywhere without a porpoise", False, True)
createPublicPost(username, domain, https, "Curiouser and curiouser!", False, True) createPublicPost(username, domain, https, "Curiouser and curiouser!", False, True)
createPublicPost(username, domain, https, "In the gardens of memory, in the palace of dreams, that is where you and I shall meet", False, True) createPublicPost(username, domain, https, "In the gardens of memory, in the palace of dreams, that is where you and I shall meet", False, True)
global testServerAliceRunning
testServerAliceRunning = True
print('Server running: Alice') print('Server running: Alice')
runDaemon(domain,port,https,federationList,useTor) runDaemon(domain,port,https,federationList,useTor)
@ -123,11 +128,19 @@ def createServerBob(path: str,port: int):
createPublicPost(username, domain, https, "It's your life, live it your way.", False, True) createPublicPost(username, domain, https, "It's your life, live it your way.", False, True)
createPublicPost(username, domain, https, "One of the things I've realised is that I am very simple", False, True) createPublicPost(username, domain, https, "One of the things I've realised is that I am very simple", False, True)
createPublicPost(username, domain, https, "Quantum physics is a bit of a passion of mine", False, True) createPublicPost(username, domain, https, "Quantum physics is a bit of a passion of mine", False, True)
global testServerBobRunning
testServerBobRunning = True
print('Server running: Bob') print('Server running: Bob')
runDaemon(domain,port,https,federationList,useTor) runDaemon(domain,port,https,federationList,useTor)
def testPostMessageBetweenServers(): def testPostMessageBetweenServers():
print('Testing sending message from one server to the inbox of another') print('Testing sending message from one server to the inbox of another')
global testServerAliceRunning
global testServerBobRunning
testServerAliceRunning = False
testServerBobRunning = False
baseDir=os.getcwd() baseDir=os.getcwd()
if not os.path.isdir(baseDir+'/.tests'): if not os.path.isdir(baseDir+'/.tests'):
os.mkdir(baseDir+'/.tests') os.mkdir(baseDir+'/.tests')
@ -141,7 +154,11 @@ def testPostMessageBetweenServers():
thrBob.start() thrBob.start()
assert thrBob.isAlive()==True assert thrBob.isAlive()==True
time.sleep(10) # wait for both servers to be running
while not (testServerAliceRunning and testServerBobRunning):
time.sleep(1)
time.sleep(3)
# stop the servers # stop the servers
thrAlice.kill() thrAlice.kill()