qa: Fixup setting of PATH env var #13353

MarcoFalke commented at 8:54 PM on May 30, 2018: member

This was an oversight of mine in #13188

Can be trivially tested with BITCOIND=bitcoin-qt ./test/functional/wallet_disable.py before and after this fix.

MarcoFalke added the label Tests on May 30, 2018

in test/functional/test_framework/test_framework.py:133 in fa0c5bd60e outdated

 129 | @@ -130,8 +130,8 @@ def main(self):
 130 |          self.options.bitcoind = os.getenv("BITCOIND", default=config["environment"]["BUILDDIR"] + '/src/bitcoind' + config["environment"]["EXEEXT"])
 131 |          self.options.bitcoincli = os.getenv("BITCOINCLI", default=config["environment"]["BUILDDIR"] + '/src/bitcoin-cli' + config["environment"]["EXEEXT"])
 132 |  
 133 | -        os.environ['PATH'] = config['environment']['BUILDDIR'] + os.pathsep + \
 134 | -                             config['environment']['BUILDDIR'] + os.path.sep + "qt" + os.pathsep + \
 135 | +        os.environ['PATH'] = os.path.join(config['environment']['BUILDDIR'], 'src') + os.pathsep + \

mess110 commented at 10:12 PM on May 30, 2018:

nit to avoid manual string building and os.pathsep duplicate

os.pathsep.join([
  os.path.join(config['environment']['BUILDDIR'], 'src'),
  os.path.join(config['environment']['BUILDDIR'], 'src', 'qt'),
  os.environ['PATH']
])

randolf approved

qa: Fixup setting of PATH env var fa26cf0156

MarcoFalke force-pushed on May 31, 2018

mess110 commented at 2:54 PM on May 31, 2018: contributor

ACK fa26cf0

fanquake commented at 8:52 AM on June 1, 2018: member

tACK fa26cf0 Quickly tested using the method mentioned. master (0b1c0c462edab63cf16f3ed10af8b6769fdc5399):

$ BITCOIND=bitcoin-qt ./test/functional/wallet_disable.py
2018-06-01T08:46:00.933000Z TestFramework (INFO): Initializing test directory /var/folders/tg/m2x9fgs930d8xrf6n6gldrtc0000gn/T/testhf4f1yss
2018-06-01T08:46:01.191000Z TestFramework (ERROR): Assertion failed
Traceback (most recent call last):
  File "/bitcoin/test/functional/test_framework/test_framework.py", line 282, in start_nodes
    node.wait_for_rpc_connection()
  File "/bitcoin/test/functional/test_framework/test_node.py", line 161, in wait_for_rpc_connection
    'bitcoind exited with status {} during initialization'.format(self.process.returncode)))
test_framework.test_node.FailedToStartError: [node 0] bitcoind exited with status -6 during initialization
During handling of the above exception, another exception occurred:
Traceback (most recent call last):
  File "/bitcoin/test/functional/test_framework/test_framework.py", line 151, in main
    self.setup_network()
  File "/bitcoin/test/functional/test_framework/test_framework.py", line 222, in setup_network
    self.setup_nodes()
  File "/bitcoin/test/functional/test_framework/test_framework.py", line 237, in setup_nodes
    self.start_nodes()
  File "/bitcoin/test/functional/test_framework/test_framework.py", line 285, in start_nodes
    self.stop_nodes()
  File "/bitcoin/test/functional/test_framework/test_framework.py", line 301, in stop_nodes
    node.stop_node()
  File "/bitcoin/test/functional/test_framework/test_node.py", line 196, in stop_node
    self.stop()
  File "/bitcoin/test/functional/test_framework/test_node.py", line 125, in __getattr__
    assert self.rpc_connected and self.rpc is not None, self._node_msg("Error: no RPC connection")
AssertionError: [node 0] Error: no RPC connection
2018-06-01T08:46:01.193000Z TestFramework (INFO): Stopping nodes
Traceback (most recent call last):
  File "./test/functional/wallet_disable.py", line 34, in <module>
    DisableWalletTest ().main ()
  File "/bitcoin/test/functional/test_framework/test_framework.py", line 175, in main
    self.stop_nodes()
  File "/bitcoin/test/functional/test_framework/test_framework.py", line 301, in stop_nodes
    node.stop_node()
  File "/bitcoin/test/functional/test_framework/test_node.py", line 196, in stop_node
    self.stop()
  File "/bitcoin/test/functional/test_framework/test_node.py", line 125, in __getattr__
    assert self.rpc_connected and self.rpc is not None, self._node_msg("Error: no RPC connection")
AssertionError: [node 0] Error: no RPC connection
[node 0] Cleaning up leftover process

This PR (fa26cf0):

$ BITCOIND=bitcoin-qt ./test/functional/wallet_disable.py
2018-06-01T08:48:51.961000Z TestFramework (INFO): Initializing test directory /var/folders/tg/m2x9fgs930d8xrf6n6gldrtc0000gn/T/testyko2upee
2018-06-01T08:48:52.989000Z TestFramework (INFO): Stopping nodes
2018-06-01T08:48:53.728000Z TestFramework (INFO): Cleaning up /var/folders/tg/m2x9fgs930d8xrf6n6gldrtc0000gn/T/testyko2upee on exit
2018-06-01T08:48:53.728000Z TestFramework (INFO): Tests successful

laanwj merged this on Jun 1, 2018

laanwj closed this on Jun 1, 2018

laanwj referenced this in commit d4f6dac9ab on Jun 1, 2018

MarcoFalke deleted the branch on Jun 1, 2018

UdjinM6 referenced this in commit 14409b8b39 on Jun 19, 2021

UdjinM6 referenced this in commit 0187d4a1d5 on Jun 24, 2021

UdjinM6 referenced this in commit 97ab813bd9 on Jun 26, 2021

UdjinM6 referenced this in commit a04cf961de on Jun 26, 2021

PastaPastaPasta referenced this in commit 09282ffc2a on Jun 27, 2021

PastaPastaPasta referenced this in commit da6d8a1e24 on Jun 28, 2021

PastaPastaPasta referenced this in commit 071f5c032b on Jun 28, 2021

UdjinM6 referenced this in commit b12936ba71 on Jun 28, 2021

PastaPastaPasta referenced this in commit 30310215a0 on Jun 29, 2021

DrahtBot locked this on Sep 8, 2021