phantom/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-01-25 18:52:58 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Write settings json files out to unique files per test"

Browse source 
This reverts commit 6227c58796.
This commit is contained in:
Miguel Jacq 2018-10-12 11:50:12 +11:00
parent 6227c58796
commit 297edbe637
No known key found for this signature in database
GPG key ID: EEA4341C6D97A0B6
8 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests_gui_local/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')
@ -44,7 +44,8 @@ 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))
settings_filename = '/tmp/testsettings.json'
open(settings_filename, 'w').write(json.dumps(test_settings))
gui = OnionShareGui(common, testonion, qtapp, app, ['/tmp/test.txt'], settings_filename, True)
return gui
@ -53,7 +54,6 @@ class GuiBaseTest(object):
def tear_down():
try:
os.remove('/tmp/test.txt')
os.remove('/tmp/download.zip')
shutil.rmtree('/tmp/OnionShare')
except:
pass

2
tests_gui_local/onionshare_receive_mode_upload_public_mode_test.py
View file

@ -11,7 +11,7 @@ class ReceiveModePublicModeTest(unittest.TestCase, GuiReceiveTest):
"public_mode": True,
"receive_allow_receiver_shutdown": True
}
cls.gui = GuiReceiveTest.set_up(test_settings, 'ReceiveModePublicModeTest')
cls.gui = GuiReceiveTest.set_up(test_settings)
@classmethod
def tearDownClass(cls):

2
tests_gui_local/onionshare_receive_mode_upload_test.py
View file

@ -10,7 +10,7 @@ class ReceiveModeTest(unittest.TestCase, GuiReceiveTest):
test_settings = {
"receive_allow_receiver_shutdown": True
}
cls.gui = GuiReceiveTest.set_up(test_settings, 'ReceiveModeTest')
cls.gui = GuiReceiveTest.set_up(test_settings)
@classmethod
def tearDownClass(cls):

2
tests_gui_local/onionshare_share_mode_download_public_mode_test.py
View file

@ -10,7 +10,7 @@ class ShareModePublicModeTest(unittest.TestCase, GuiShareTest):
test_settings = {
"public_mode": True,
}
cls.gui = GuiShareTest.set_up(test_settings, 'ShareModePublicModeTest')
cls.gui = GuiShareTest.set_up(test_settings)
@classmethod
def tearDownClass(cls):

2
tests_gui_local/onionshare_share_mode_download_stay_open_test.py
View file

@ -10,7 +10,7 @@ class ShareModeStayOpenTest(unittest.TestCase, GuiShareTest):
test_settings = {
"close_after_first_download": False,
}
cls.gui = GuiShareTest.set_up(test_settings, 'ShareModeStayOpenTest')
cls.gui = GuiShareTest.set_up(test_settings)
@classmethod
def tearDownClass(cls):

2
tests_gui_local/onionshare_share_mode_download_test.py
View file

@ -9,7 +9,7 @@ class ShareModeTest(unittest.TestCase, GuiShareTest):
def setUpClass(cls):
test_settings = {
}
cls.gui = GuiShareTest.set_up(test_settings, 'ShareModeTest')
cls.gui = GuiShareTest.set_up(test_settings)
@classmethod
def tearDownClass(cls):

2
tests_gui_local/onionshare_share_mode_slug_persistent_test.py
View file

@ -13,7 +13,7 @@ class ShareModePersistentSlugTest(unittest.TestCase, GuiShareTest):
"save_private_key": True,
"close_after_first_download": False,
}
cls.gui = GuiShareTest.set_up(test_settings, 'ShareModePersistentSlugTest')
cls.gui = GuiShareTest.set_up(test_settings)
@classmethod
def tearDownClass(cls):

2
tests_gui_local/onionshare_share_mode_timer_test.py
View file

@ -11,7 +11,7 @@ class ShareModeTimerTest(unittest.TestCase, GuiShareTest):
"public_mode": False,
"shutdown_timeout": True,
}
cls.gui = GuiShareTest.set_up(test_settings, 'ShareModeTimerTest')
cls.gui = GuiShareTest.set_up(test_settings)
@classmethod
def tearDownClass(cls):