Ecosystem/basicswap
1
0
Fork 0
mirror of https://github.com/basicswap/basicswap.git synced 2024-12-23 03:49:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

namecoin pidfile name and workaround for ci prepare.

Browse source
This commit is contained in:
tecnovert 2019-07-31 21:22:07 +02:00
parent 545b5e6975
commit 8731c9796a
No known key found for this signature in database
GPG key ID: 8ED6D8750C4E3F93
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
basicswap/basicswap.py
View file

@ -443,7 +443,9 @@ class BasicSwap():
chain_client_settings = self.getChainClientSettings(coin) chain_client_settings = self.getChainClientSettings(coin)
authcookiepath = os.path.join(self.getChainDatadirPath(coin), '.cookie') authcookiepath = os.path.join(self.getChainDatadirPath(coin), '.cookie')
pidfilename = cc['name'] + ('d' if cc['name'] == 'bitcoin' else '') pidfilename = cc['name']
if cc['name'] == 'bitcoin' or cc['name'] == 'namecoin':
pidfilename += 'd'
pidfilepath = os.path.join(self.getChainDatadirPath(coin), pidfilename + '.pid') pidfilepath = os.path.join(self.getChainDatadirPath(coin), pidfilename + '.pid')
self.log.debug('Reading %s rpc credentials from auth cookie %s', coin, authcookiepath) self.log.debug('Reading %s rpc credentials from auth cookie %s', coin, authcookiepath)
# Wait for daemon to start # Wait for daemon to start

2
tests/basicswap/test_prepare.py
View file

@ -33,7 +33,7 @@ class Test(unittest.TestCase):
super(Test, self).tearDownClass() super(Test, self).tearDownClass()
def test(self): def test(self):
testargs = ['basicswap-prepare', '-datadir=' + test_path] testargs = ['basicswap-prepare', '-datadir=' + test_path, '-particl_mnemonic=none'] # Why won't the daemon run in travis-ci?
with patch.object(sys, 'argv', testargs): with patch.object(sys, 'argv', testargs):
prepareSystem.main() prepareSystem.main()