Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3.1 -> main] Fix python format issue that caused test to fail #70

Merged
merged 3 commits into from
Aug 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ jobs:
ctest --output-on-failure -L "nonparallelizable_tests"
- name: Bundle logs from failed tests
if: failure()
run: tar -czf ${{matrix.platform}}-serial-logs.tar.gz build/var build/etc
run: tar -czf ${{matrix.platform}}-serial-logs.tar.gz build/var build/etc build/leap-ignition-wd
- name: Upload logs from failed tests
uses: actions/upload-artifact@v3
if: failure()
Expand Down Expand Up @@ -183,7 +183,7 @@ jobs:
ctest --output-on-failure -R ${{matrix.test-name}}
- name: Bundle logs from failed tests
if: failure()
run: tar -czf ${{matrix.platform}}-${{matrix.test-name}}-logs.tar.gz build/var build/etc
run: tar -czf ${{matrix.platform}}-${{matrix.test-name}}-logs.tar.gz build/var build/etc build/leap-ignition-wd
- name: Upload logs from failed tests
uses: actions/upload-artifact@v3
if: failure()
Expand Down
2 changes: 1 addition & 1 deletion testnet.template
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ if [ -z "$bioscurrencysymbol" ]; then
bioscurrencysymbol="SYS"
fi

wddir=eosio-ignition-wd
wddir=leap-ignition-wd
wdaddr=localhost:8899
wdurl=http://$wdaddr
# Manual deployers, add a line below this block that looks like:
Expand Down
2 changes: 1 addition & 1 deletion tests/TestHarness/Cluster.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class Cluster(object):
__BiosHost="localhost"
__BiosPort=8788
__LauncherCmdArr=[]
__bootlog="eosio-ignition-wd/bootlog.txt"
__bootlog="leap-ignition-wd/bootlog.txt"

# pylint: disable=too-many-arguments
# walletd [True|False] Is keosd running. If not load the wallet plugin
Expand Down
8 changes: 4 additions & 4 deletions tests/TestHarness/WalletMgr.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
Wallet=namedtuple("Wallet", "name password host port")
# pylint: disable=too-many-instance-attributes
class WalletMgr(object):
__walletLogOutFile="test_keosd_out.log"
__walletLogErrFile="test_keosd_err.log"
__walletDataDir="test_wallet_0"
__walletLogOutFile="var/test_keosd_out.log"
__walletLogErrFile="var/test_keosd_err.log"
__walletDataDir="var/test_wallet_0"
__MaxPort=9999

# pylint: disable=too-many-arguments
Expand Down Expand Up @@ -127,7 +127,7 @@ def create(self, name, accounts=None, exitOnError=True):
portStatus="AVAILABLE"
else:
portStatus="NOT AVAILABLE"
if Utils.Debug: Utils.Print("%s was not accepted, delaying for %d seconds and trying again. port %d is %s. %s - {%s}" % (cmdDesc, delay, self.port, pgrepCmd, psOut))
if Utils.Debug: Utils.Print("%s was not accepted, delaying for %d seconds and trying again. port %d is %s. %s - {%s}" % (cmdDesc, delay, self.port, pgrepCmd, psOut, portStatus))
time.sleep(delay)
continue

Expand Down