QA: feature_filelock, interface_bitcoin_cli: Use PACKAGE_NAME in messages rather than hardcoding Bitcoin Core #15896

pull luke-jr wants to merge 1 commits into bitcoin:master from luke-jr:qa_pkgname changing 3 files +3 −2

luke-jr commented at 8:44 PM on April 25, 2019: member

No description provided.
QA: feature_filelock, interface_bitcoin_cli: Use PACKAGE_NAME in messages rather than hardcoding Bitcoin Core fcc443b636
practicalswift commented at 9:09 PM on April 25, 2019: contributor

utACK fcc443b6367b44d5fdc04db36ec4a286d5b59162
DrahtBot added the label Build system on Apr 25, 2019
DrahtBot added the label Tests on Apr 25, 2019
MarcoFalke merged this on Apr 26, 2019
MarcoFalke closed this on Apr 26, 2019
MarcoFalke referenced this in commit 5046d4e911 on Apr 26, 2019
promag commented at 1:52 PM on April 26, 2019: member

utACK fcc443b.
hebasto commented at 5:20 PM on April 26, 2019: member

It seems interface_bitcoin_cli.py is broken in AppVeyor now.
Sjors commented at 6:08 PM on April 26, 2019: member

Normally ignoring AppVeyor failures isn't a huge issue, but this PR changed test/config.ini.in.
in test/functional/interface_bitcoin_cli.py:19 in fcc443b636
```
  15 | @@ -16,7 +16,7 @@ def run_test(self):
  16 |          """Main test logic"""
  17 |  
  18 |          cli_response = self.nodes[0].cli("-version").send_cli()
  19 | -        assert "Bitcoin Core RPC client version" in cli_response
  20 | +        assert "{} RPC client version".format(self.config['environment']['PACKAGE_NAME']) in cli_response
```
Sjors commented at 6:16 PM on April 26, 2019:

Can this be replaced with an assert_equal test? That makes it easier to debug whether there's a problem with the testsuite or the binary in AppVeyor. (most likely the problem is with the test, since this PR only touched the test)

Sjors commented at 6:24 PM on April 26, 2019:

Note that in other places self is left out, e.g. '/src/bitcoind' + config["environment"]["EXEEXT"]
MarcoFalke commented at 6:41 PM on April 26, 2019:

assert_equal doesn't work because the version is suffixed by the commit

$ ./src/bitcoin-cli -version Bitcoin Core RPC client version v0.18.99.0-b1e013e4fa
MarcoFalke commented at 6:42 PM on April 26, 2019:

I guess you could strip the commit, but :man_shrugging:
in test/config.ini.in:9 in fcc443b636
```
   5 | @@ -6,6 +6,7 @@
   6 |  # test/functional/test_runner.py and test/util/bitcoin-util-test.py
   7 |  
   8 |  [environment]
   9 | +PACKAGE_NAME=@PACKAGE_NAME@
```
Sjors commented at 6:23 PM on April 26, 2019:

You probably need to add something here, though I'm not sure what: https://github.com/bitcoin/bitcoin/blob/master/.appveyor.yml#L41-L48

Sjors commented at 6:26 PM on April 26, 2019:

Update, indeed, see #15903
MarcoFalke referenced this in commit ec519d4d54 on Apr 26, 2019
jasonbcox referenced this in commit bd83a3cadb on Aug 1, 2020
Munkybooty referenced this in commit c7e8e2630f on Oct 3, 2021
Munkybooty referenced this in commit 0d9fa24e2d on Oct 7, 2021
Munkybooty referenced this in commit 8bafb7f9ed on Oct 7, 2021
Munkybooty referenced this in commit 3a7c506a99 on Oct 12, 2021
Munkybooty referenced this in commit cbbaf4bdc9 on Oct 16, 2021
Munkybooty referenced this in commit c190dc476d on Oct 20, 2021
Munkybooty referenced this in commit 6a7e14d661 on Oct 21, 2021
Munkybooty referenced this in commit db92272ab1 on Oct 23, 2021
Munkybooty referenced this in commit 47e2274e2e on Oct 26, 2021
Munkybooty referenced this in commit f752117334 on Oct 28, 2021
Munkybooty referenced this in commit 882da0c752 on Nov 12, 2021
Munkybooty referenced this in commit b929a75dd7 on Nov 13, 2021
Munkybooty referenced this in commit 3856ce485e on Nov 14, 2021
pravblockc referenced this in commit be4473fb26 on Nov 18, 2021
DrahtBot locked this on Dec 16, 2021

Contributors

Labels

Linked (view graph)

#15903 appveyor: Write @PACKAGE_NAME@ to config