From 94d93eb4efc79ec9fa82d2f13da8c626b5751a4c Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sun, 18 Aug 2019 10:45:04 +0100 Subject: [PATCH] Remove old test function --- tests.py | 176 +------------------------------------------------------ 1 file changed, 1 insertion(+), 175 deletions(-) diff --git a/tests.py b/tests.py index c1923c84f..99ffe5569 100644 --- a/tests.py +++ b/tests.py @@ -484,7 +484,7 @@ def testPostMessageBetweenServers(): shutil.rmtree(aliceDir) shutil.rmtree(bobDir) -def testFollowBetweenServersOld(): +def testFollowBetweenServers(): print('Testing sending a follow request from one server to another') global testServerAliceRunning @@ -768,180 +768,6 @@ def testFollowBetweenServersOld(): os.chdir(baseDir) shutil.rmtree(baseDir+'/.tests') -def testFollowBetweenServers(): - print('Testing sending a follow request from one server to another') - - global testServerAliceRunning - global testServerBobRunning - global testServerEveRunning - testServerAliceRunning = False - testServerBobRunning = False - testServerEveRunning = False - - httpPrefix='http' - useTor=False - federationList=[] - - baseDir=os.getcwd() - if os.path.isdir(baseDir+'/.tests'): - shutil.rmtree(baseDir+'/.tests') - os.mkdir(baseDir+'/.tests') - - ocapAlways=False - - # create the servers - aliceDir=baseDir+'/.tests/alice' - aliceDomain='127.0.0.42' - alicePort=61935 - thrAlice = \ - threadWithTrace(target=createServerAlice, \ - args=(aliceDir,aliceDomain,alicePort, \ - federationList,False,False, \ - ocapAlways),daemon=True) - - bobDir=baseDir+'/.tests/bob' - bobDomain='127.0.0.64' - bobPort=61936 - thrBob = \ - threadWithTrace(target=createServerBob, \ - args=(bobDir,bobDomain,bobPort, \ - federationList,False,False, \ - ocapAlways),daemon=True) - - eveDir=baseDir+'/.tests/eve' - eveDomain='127.0.0.55' - evePort=61937 - thrEve = \ - threadWithTrace(target=createServerEve, \ - args=(eveDir,eveDomain,evePort, \ - federationList,False,False, \ - False),daemon=True) - - thrAlice.start() - thrBob.start() - thrEve.start() - assert thrAlice.isAlive()==True - assert thrBob.isAlive()==True - assert thrEve.isAlive()==True - - # wait for all servers to be running - ctr=0 - while not (testServerAliceRunning and testServerBobRunning and testServerEveRunning): - time.sleep(1) - ctr+=1 - if ctr>60: - break - print('Alice online: '+str(testServerAliceRunning)) - print('Bob online: '+str(testServerBobRunning)) - print('Eve online: '+str(testServerEveRunning)) - assert ctr<=60 - time.sleep(1) - - # In the beginning all was calm and there were no follows - - print('*********************************************************') - print('Alice sends a follow request to Bob') - print('Both are strictly enforcing object capabilities') - os.chdir(aliceDir) - sessionAlice = createSession(aliceDomain,alicePort,useTor) - inReplyTo=None - inReplyToAtomUri=None - subject=None - aliceSendThreads = [] - alicePostLog = [] - followersOnly=False - saveToFile=True - clientToServer=False - ccUrl=None - alicePersonCache={} - aliceCachedWebfingers={} - aliceSendThreads=[] - alicePostLog=[] - sendResult = \ - sendFollowRequest(sessionAlice,aliceDir, \ - 'alice',aliceDomain,alicePort,httpPrefix, \ - 'bob',bobDomain,bobPort,httpPrefix, \ - clientToServer,federationList, \ - aliceSendThreads,alicePostLog, \ - aliceCachedWebfingers,alicePersonCache, \ - True,__version__) - print('sendResult: '+str(sendResult)) - - bobCapsFilename=bobDir+'/accounts/bob@'+bobDomain+'/ocap/accept/'+httpPrefix+':##'+aliceDomain+':'+str(alicePort)+'#users#alice.json' - aliceCapsFilename=aliceDir+'/accounts/alice@'+aliceDomain+'/ocap/granted/'+httpPrefix+':##'+bobDomain+':'+str(bobPort)+'#users#bob.json' - - for t in range(10): - if os.path.isfile(bobDir+'/accounts/bob@'+bobDomain+'/followers.txt'): - if os.path.isfile(aliceDir+'/accounts/alice@'+aliceDomain+'/following.txt'): - if os.path.isfile(bobCapsFilename): - if os.path.isfile(aliceCapsFilename): - break - time.sleep(1) - - with open(bobCapsFilename, 'r') as fp: - bobCapsJson=commentjson.load(fp) - if not bobCapsJson.get('capability'): - print("Unexpected format for Bob's capabilities") - pprint(bobCapsJson) - assert False - assert validInbox(bobDir,'bob',bobDomain) - assert validInboxFilenames(bobDir,'bob',bobDomain,aliceDomain,alicePort) - - print('\n\n*********************************************************') - print('Alice sends a message to Bob') - aliceSendThreads = [] - alicePostLog = [] - alicePersonCache={} - aliceCachedWebfingers={} - aliceSendThreads=[] - alicePostLog=[] - useBlurhash=False - sendResult = \ - sendPost(__version__, \ - sessionAlice,aliceDir,'alice', aliceDomain, alicePort, \ - 'bob', bobDomain, bobPort, ccUrl, \ - httpPrefix, 'Alice message', followersOnly, saveToFile, \ - clientToServer,None,None,useBlurhash, federationList, \ - aliceSendThreads, alicePostLog, aliceCachedWebfingers, \ - alicePersonCache,inReplyTo, inReplyToAtomUri, subject) - print('sendResult: '+str(sendResult)) - - queuePath=bobDir+'/accounts/bob@'+bobDomain+'/queue' - inboxPath=bobDir+'/accounts/bob@'+bobDomain+'/inbox' - aliceMessageArrived=False - for i in range(20): - time.sleep(1) - if os.path.isdir(inboxPath): - if len([name for name in os.listdir(inboxPath) if os.path.isfile(os.path.join(inboxPath, name))])>0: - aliceMessageArrived=True - print('Alice message sent to Bob!') - break - - assert aliceMessageArrived==True - print('Message from Alice to Bob succeeded') - - # stop the servers - thrAlice.kill() - thrAlice.join() - assert thrAlice.isAlive()==False - - thrBob.kill() - thrBob.join() - assert thrBob.isAlive()==False - - thrEve.kill() - thrEve.join() - assert thrEve.isAlive()==False - - assert 'alice@'+aliceDomain in open(bobDir+'/accounts/bob@'+bobDomain+'/followers.txt').read() - assert 'bob@'+bobDomain in open(aliceDir+'/accounts/alice@'+aliceDomain+'/following.txt').read() - - # queue item removed - assert len([name for name in os.listdir(queuePath) if os.path.isfile(os.path.join(queuePath, name))])==0 - - os.chdir(baseDir) - shutil.rmtree(baseDir+'/.tests') - def testFollowersOfPerson(): print('testFollowersOfPerson') currDir=os.getcwd()