Skip to content
This repository was archived by the owner on Aug 2, 2021. It is now read-only.

network/stream: more resilient TestNodesCorrectBinsDynamic#1776

Merged
janos merged 1 commit intomasterfrom
fix-stream-cursors-flaky-test
Sep 19, 2019
Merged

network/stream: more resilient TestNodesCorrectBinsDynamic#1776
janos merged 1 commit intomasterfrom
fix-stream-cursors-flaky-test

Conversation

@janos
Copy link
Copy Markdown
Member

@janos janos commented Sep 18, 2019

This PR removes a flat sleep from TestNodesCorrectBinsDynamic when waiting for StreamInfo messages to be exchanged and uses a retry loop on number of cursors.

https://travis-ci.org/ethersphere/swarm/jobs/586074056#L784

@janos janos added this to the 0.5.0 milestone Sep 18, 2019
@janos janos requested review from acud, nolash and nonsense September 18, 2019 13:38
@janos janos self-assigned this Sep 18, 2019
time.Sleep(10 * time.Millisecond)
count1 := nodeRegistry(sim, nodeIDs[0]).getPeer(nodeIDs[1]).cursorsCount()
count2 := nodeRegistry(sim, nodeIDs[1]).getPeer(nodeIDs[0]).cursorsCount()
if count1 >= wantCursorsCount && count2 >= wantCursorsCount {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should the count be equal between the nodes?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, they should. This is just the wait loop in order to validate the exact bins later in this test.

@janos janos merged commit fd34ea6 into master Sep 19, 2019
@janos janos deleted the fix-stream-cursors-flaky-test branch September 19, 2019 06:58
chadsr added a commit to chadsr/swarm that referenced this pull request Sep 23, 2019
* 'master' of github.com:ethersphere/swarm: (32 commits)
  network/stream: refactor cursors tests (ethersphere#1786)
  network: Add capabilities if peer from store does not have it (ethersphere#1791)
  Swap logger (ethersphere#1754)
  network: Add capability filtered depth calculation (ethersphere#1787)
  travis: remove go1.12 job (ethersphere#1784)
  cmd/swarm: correct bzznetworkid flag description (ethersphere#1761)
  network, pss: Capability in pss (ethersphere#1764)
  network/stream: handle nil peer in TestNodesExchangeCorrectBinIndexes (ethersphere#1779)
  protocols, retrieval: swap-enabled messages implement Price (ethersphere#1771)
  cmd/swarm-smoke: fix waitToPushSynced connection closing (ethersphere#1781)
  cmd/swarm: simplify testCluster.StartNewNodes (ethersphere#1777)
  build: increase golangci-lint deadline (ethersphere#1778)
  docker: ignore build/bin when copying files (ethersphere#1780)
  swap: fix and rename Peer.getLastSentCumulativePayout (ethersphere#1769)
  network/stream: more resilient TestNodesCorrectBinsDynamic (ethersphere#1776)
  network: Add Capabilities to Kademlia database (ethersphere#1713)
  network: add own address to KademliaInfo (ethersphere#1775)
  pss: Refactor. Step 2. Refactor forward cache (ethersphere#1742)
  all: configurable payment/disconnect thresholds (ethersphere#1729)
  network/stream/v2: more resilient TestNodesExchangeCorrectBinIndexes (ethersphere#1760)
  ...
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants