mj-saunders
/
epicyon
forked from indymedia/epicyon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

object

main
Bob Mottram 2020-03-27 19:54:41 +00:00
parent 6e7b2e5eb9
commit 9b5743159b
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
like.py
View File

@ -76,7 +76,7 @@ def undoLikesCollectionEntry(recentPostsCache: {}, \
del postJsonObject['object']['likes'] del postJsonObject['object']['likes']
else: else:
postJsonObject['object']['likes']['totalItems']= \ postJsonObject['object']['likes']['totalItems']= \
len(postJsonObject['likes']['items']) len(postJsonObject['object']['likes']['items'])
saveJson(postJsonObject,postFilename) saveJson(postJsonObject,postFilename)
def likedByPerson(postJsonObject: {}, nickname: str,domain: str) -> bool: def likedByPerson(postJsonObject: {}, nickname: str,domain: str) -> bool:

23
tests.py
View File

@ -549,8 +549,10 @@ def testPostMessageBetweenServers():
outboxPath=bobDir+'/accounts/bob@'+bobDomain+'/outbox' outboxPath=bobDir+'/accounts/bob@'+bobDomain+'/outbox'
outboxBeforeAnnounceCount=len([name for name in os.listdir(outboxPath) if os.path.isfile(os.path.join(outboxPath, name))]) outboxBeforeAnnounceCount=len([name for name in os.listdir(outboxPath) if os.path.isfile(os.path.join(outboxPath, name))])
beforeAnnounceCount=len([name for name in os.listdir(inboxPath) if os.path.isfile(os.path.join(inboxPath, name))]) beforeAnnounceCount=len([name for name in os.listdir(inboxPath) if os.path.isfile(os.path.join(inboxPath, name))])
assert beforeAnnounceCount==0
print('inbox items before announce: '+str(beforeAnnounceCount)) print('inbox items before announce: '+str(beforeAnnounceCount))
print('outbox items before announce: '+str(outboxBeforeAnnounceCount))
assert outboxBeforeAnnounceCount==0
assert beforeAnnounceCount==0
announcePublic(sessionBob,bobDir,federationList, \ announcePublic(sessionBob,bobDir,federationList, \
'bob',bobDomain,bobPort,httpPrefix, \ 'bob',bobDomain,bobPort,httpPrefix, \
objectUrl, \ objectUrl, \
@ -558,17 +560,24 @@ def testPostMessageBetweenServers():
bobPersonCache,bobCachedWebfingers, \ bobPersonCache,bobCachedWebfingers, \
True,__version__) True,__version__)
announceMessageArrived=False announceMessageArrived=False
outboxMessageArrived=False
for i in range(10): for i in range(10):
time.sleep(1) time.sleep(1)
if os.path.isdir(inboxPath): if not os.path.isdir(inboxPath):
if len([name for name in os.listdir(inboxPath) if os.path.isfile(os.path.join(inboxPath, name))])>0: continue
announceMessageArrived=True if len([name for name in os.listdir(outboxPath) if os.path.isfile(os.path.join(outboxPath, name))])>0:
print('Announce message sent to Alice!') outboxMessageArrived=True
break print('Announce created by Bob')
if len([name for name in os.listdir(inboxPath) if os.path.isfile(os.path.join(inboxPath, name))])>0:
announceMessageArrived=True
print('Announce message sent to Alice!')
if announceMessageArrived and outboxMessageArrived:
break
afterAnnounceCount=len([name for name in os.listdir(inboxPath) if os.path.isfile(os.path.join(inboxPath, name))]) afterAnnounceCount=len([name for name in os.listdir(inboxPath) if os.path.isfile(os.path.join(inboxPath, name))])
outboxAfterAnnounceCount=len([name for name in os.listdir(outboxPath) if os.path.isfile(os.path.join(outboxPath, name))]) outboxAfterAnnounceCount=len([name for name in os.listdir(outboxPath) if os.path.isfile(os.path.join(outboxPath, name))])
print('inbox items after announce: '+str(afterAnnounceCount)) print('inbox items after announce: '+str(afterAnnounceCount))
assert afterAnnounceCount==beforeAnnounceCount+1 print('outbox items after announce: '+str(outboxAfterAnnounceCount))
#assert afterAnnounceCount==beforeAnnounceCount+1
assert outboxAfterAnnounceCount==outboxBeforeAnnounceCount+1 assert outboxAfterAnnounceCount==outboxBeforeAnnounceCount+1
# stop the servers # stop the servers
thrAlice.kill() thrAlice.kill()