Skip to content

Commit

Permalink
Merge pull request #2071 from rameshthoomu/dockerip
Browse files Browse the repository at this point in the history
Fixes Issue# 2115
  • Loading branch information
srderson committed Jul 6, 2016
2 parents c636e42 + c1d20a0 commit b615680
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions bddtests/compose-defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ vp:
# TODO: This is currently required due to BUG in variant logic based upon log level.
- CORE_LOGGING_LEVEL=DEBUG
# Startup of peer must be delayed to allow membersrvc to come up first
#command: sh -c "sleep 5; peer node start"
command: peer node start
command: sh -c "sleep 5; peer node start"
#command: peer node start

# Use these options if coverage desired for peers
#image: hyperledger/fabric-peer-coverage
Expand Down
2 changes: 1 addition & 1 deletion bddtests/peer_basic.feature
Original file line number Diff line number Diff line change
Expand Up @@ -1074,7 +1074,7 @@ Feature: Network of Peers

Given I start peers:
| vp0 |
And I wait "5" seconds
And I wait "10" seconds

When requesting "/network/peers" from "vp1"
Then I should get a JSON response with array "peers" contains "2" elements
Expand Down
2 changes: 1 addition & 1 deletion bddtests/steps/peer_basic_impl.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def parseComposeOutput(context):
for containerName in containerNames:
output, error, returncode = \
bdd_test_util.cli_call(context, ["docker", "inspect", "--format", "{{ .NetworkSettings.IPAddress }}", containerName], expect_success=True)
#print("container {0} has address = {1}".format(containerName, output.splitlines()[0]))
print("container {0} has address = {1}".format(containerName, output.splitlines()[0]))
ipAddress = output.splitlines()[0]

# Get the environment array
Expand Down

0 comments on commit b615680

Please sign in to comment.