Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-05-10 10:25:03 -04:00
Code Issues Projects Releases Packages Wiki Activity

Remove unique settings file per test, because they don't run concurrently anymore

Browse source
This commit is contained in:
Miguel Jacq 2018-10-17 16:31:51 +11:00
parent 0176535e50
commit b749fc8d12
No known key found for this signature in database
GPG key ID: EEA4341C6D97A0B6
34 changed files with 41 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

7
tests/GuiBaseTest.py
View file

@ -19,7 +19,7 @@ from onionshare_gui.mode.receive_mode import ReceiveMode
class GuiBaseTest(object):
@staticmethod
def set_up(test_settings, settings_filename):
def set_up(test_settings):
'''Create GUI with given settings'''
# Create our test file
testfile = open('/tmp/test.txt', 'w')
@ -51,9 +51,9 @@ class GuiBaseTest(object):
app = OnionShare(common, testonion, True, 0)
web = Web(common, False, True)
open('/tmp/{}.json'.format(settings_filename), 'w').write(json.dumps(test_settings))
open('/tmp/settings.json', 'w').write(json.dumps(test_settings))
gui = OnionShareGui(common, testonion, qtapp, app, ['/tmp/test.txt', '/tmp/testdir'], '/tmp/{}.json'.format(settings_filename), True)
gui = OnionShareGui(common, testonion, qtapp, app, ['/tmp/test.txt', '/tmp/testdir'], '/tmp/settings.json', True)
return gui
@staticmethod
@ -61,6 +61,7 @@ class GuiBaseTest(object):
'''Clean up after tests'''
try:
os.remove('/tmp/test.txt')
os.remove('/tmp/settings.json')
os.remove('/tmp/largefile')
shutil.rmtree('/tmp/OnionShare')
shutil.rmtree('/tmp/testdir')