Tests: address placement should be deterministic by default #10765

pull ReneNyffenegger wants to merge 1 commits into bitcoin:master from ReneNyffenegger:test-addrman changing 1 files +6 −34

ReneNyffenegger commented at 2:16 PM on July 7, 2017: contributor

Better version of wrong and closed pull request https://github.com/bitcoin/bitcoin/pull/10764
fanquake added the label Tests on Jul 7, 2017
in src/test/addrman_tests.cpp:18 in 6d357a1996 outdated
```
  14 | @@ -15,9 +15,13 @@ class CAddrManTest : public CAddrMan
  15 |      uint64_t state;
  16 |  
  17 |  public:
  18 | -    CAddrManTest()
  19 | +    CAddrManTest(bool makeDeterministic=true)
```
promag commented at 8:42 PM on July 10, 2017:

Well there is no need for constructor argument, just call MakeDeterministic().

ReneNyffenegger commented at 9:20 PM on July 10, 2017:

I've added the parameter bool makeDeterministic=true in case a future test explicitly doesn't want to call MakeDeterministic().

in src/test/addrman_tests.cpp:22 in 6d357a1996 outdated

  14 | @@ -15,9 +15,13 @@ class CAddrManTest : public CAddrMan
  15 |      uint64_t state;
  16 |  
  17 |  public:
  18 | -    CAddrManTest()
  19 | +    CAddrManTest(bool makeDeterministic=true)
  20 |      {
  21 |          state = 1;
  22 | +
  23 | +        if (makeDeterministic)

jonasschnelli commented at 7:47 AM on July 13, 2017:

brackets

jonasschnelli commented at 11:47 AM on July 13, 2017: contributor

@ReneNyffenegger: Maybe do git reset --hard origin/masterfollowed by a git cherry-pick 717dfaa4b507232b7169593b80c1a5b3b3ddf553 and then push with --force.
ReneNyffenegger commented at 11:47 AM on July 13, 2017: contributor

I really have no idea what's going on with this pull request. I've added the brackets for the if statement - now this pull request says that I want to merge 62 commits ... This is if course not true.
ReneNyffenegger force-pushed on Jul 13, 2017
ReneNyffenegger referenced this in commit b47c8510a1 on Jul 13, 2017
ReneNyffenegger commented at 11:57 AM on July 13, 2017: contributor

@jonasschnelli I've done the git reset --hard..., git cherry-pick..., git push --force, as proposed. I have to admit I have no idea what exactly that did to either my forked repo and/or the github bitcoin/bitcoin repository. The changes seem right, though.
TheBlueMatt commented at 7:57 PM on July 14, 2017: member

utACK
MarcoFalke commented at 9:45 PM on July 16, 2017: member

Please run through clang format to fix white space and braces. Also adjust the commit message with git commit --amend -m 'Tests: address placement should be deterministic by default' or similar.
ReneNyffenegger force-pushed on Jul 17, 2017
ReneNyffenegger force-pushed on Jul 17, 2017
ReneNyffenegger commented at 2:24 PM on July 17, 2017: contributor

done clang formatting and amended commit message.
Tests: address placement should be deterministic by default c5ebddd114
ReneNyffenegger force-pushed on Jul 17, 2017
ReneNyffenegger force-pushed on Jul 19, 2017
MarcoFalke commented at 3:49 PM on August 11, 2017: member

utACK c5ebddd114ea7794ca0c12af735294dcae805216
MarcoFalke merged this on Aug 11, 2017
MarcoFalke closed this on Aug 11, 2017
MarcoFalke referenced this in commit 2c811e08db on Aug 11, 2017
MarcoFalke referenced this in commit c7b7cf299a on Jul 19, 2019
PastaPastaPasta referenced this in commit 3acf009d6c on Aug 6, 2019
PastaPastaPasta referenced this in commit b23bd0ee69 on Aug 6, 2019
PastaPastaPasta referenced this in commit 5c55c40468 on Aug 6, 2019
PastaPastaPasta referenced this in commit ab332593b9 on Aug 7, 2019
PastaPastaPasta referenced this in commit f8a262d73b on Aug 8, 2019
PastaPastaPasta referenced this in commit e5c94eea0f on Aug 12, 2019
barrystyle referenced this in commit ddf81fa414 on Jan 22, 2020
PastaPastaPasta referenced this in commit 2e76933797 on Jun 27, 2021
PastaPastaPasta referenced this in commit deecee5aee on Jun 28, 2021
PastaPastaPasta referenced this in commit 5fcfc8671d on Jun 29, 2021
PastaPastaPasta referenced this in commit 2f3df5bcb8 on Jul 1, 2021
PastaPastaPasta referenced this in commit aff252b20c on Jul 1, 2021
PastaPastaPasta referenced this in commit 7adc093657 on Jul 12, 2021
PastaPastaPasta referenced this in commit 2d5e50e6a4 on Jul 13, 2021
random-zebra referenced this in commit 85f000ecbe on Jul 30, 2021
random-zebra referenced this in commit b4751e10ce on Aug 11, 2021
DrahtBot locked this on Sep 8, 2021

Contributors

Labels

Linked (view graph)

#10764 Tests: address placement should be deterministic by default #16422 test: remove redundant setup in addrman_tests