Skip to content

Commit

Permalink
Fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@learnforpractice
learnforpractice committed Dec 26, 2022
1 parent e9c02bc commit 8258f12
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 30 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/python-app.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,13 @@ jobs:
working-directory: tests
run: |
python -m pip install -r ../requirements-dev.txt
python3 -m pytest -s -x test_mixin_api.py
- name: Test
if: ${{ matrix.os != 'windows-2019' }}
working-directory: tests
run: |
python3 -m pytest -s -x test_testnet2.py -k test_hello
python3 -m pytest -s -x test_testnet2.py -k test_deposit
python3 -m pytest -s -x test_mixin_api.py
- name: auditwheel repair
if: ${{ matrix.os == 'ubuntu-18.04' }}
id: manylinuxwhlfile
Expand Down
57 changes: 28 additions & 29 deletions tests/test_testnet2.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,20 @@

logger = log.get_logger(__name__)

tmp_dir = os.path.dirname(os.path.abspath(__file__)) + '/.tmp'

class TestMixinApi(object):

@classmethod
def setup_class(cls):
cls.nodes = []
# if '--newtestnet' in sys.argv:
for i in range(7):
port = 7001+i
config_dir = f'{tmp_dir}/mixin-{port}'
if os.path.exists(config_dir):
shutil.rmtree(config_dir)
if True:
for i in range(7):
port = 7001+i
config_dir = f'/tmp/mixin-{port}'
if os.path.exists(config_dir):
shutil.rmtree(config_dir)

if not os.path.exists(f'{tmp_dir}/mixin-7001'):
if not os.path.exists('/tmp/mixin-7001'):
cmd = f'python3 -m pymixin.main setuptestnet'
args = shlex.split(cmd)
p = subprocess.Popen(args, stdout=subprocess.PIPE)
Expand All @@ -44,12 +43,12 @@ def setup_class(cls):

for i in range(7):
port = 7001+i
# cmd = f'python3 -m mixin.main kernel -dir {tmp_dir}/mixin-700{i+1} -port {port}'
cmd = f'python3 -m pymixin.main kernel -dir {tmp_dir}/mixin-700{i+1} -port {port}'
# cmd = f'/Users/newworld/dev/mixin/mixin/mixin kernel -dir {tmp_dir}/mixin-700{i+1} -port {port}'
# cmd = f'python3 -m mixin.main kernel -dir /tmp/mixin-700{i+1} -port {port}'
cmd = f'python3 -m pymixin.main kernel -dir /tmp/mixin-700{i+1} -port {port}'
# cmd = f'/Users/newworld/dev/mixin/mixin/mixin kernel -dir /tmp/mixin-700{i+1} -port {port}'
logger.info(cmd)
args = shlex.split(cmd)
log = open(f'{tmp_dir}/mixin-700{i+1}/log.txt', 'a')
log = open(f'/tmp/mixin-700{i+1}/log.txt', 'a')
p = subprocess.Popen(args, stdout=log, stderr=log)
cls.nodes.append(p)
logger.info('++++++')
Expand Down Expand Up @@ -100,7 +99,7 @@ async def test_hello(self):

@pytest.mark.asyncio
async def test_deposit(self):
with open(f'{tmp_dir}/mixin-7001/config.toml', 'r') as f:
with open('/tmp/mixin-7001/config.toml', 'r') as f:
for line in f:
key = 'signer-key = '
start = line.find(key)
Expand All @@ -111,7 +110,7 @@ async def test_deposit(self):
break

logger.info('++++signer_key: %s', signer_key)
with open(f'{tmp_dir}/mixin-7001/genesis.json', 'r') as f:
with open('/tmp/mixin-7001/genesis.json', 'r') as f:
genesis = f.read()
genesis = json.loads(genesis)
domain_node = genesis['domains'][0]
Expand Down Expand Up @@ -247,7 +246,7 @@ async def test_deposit(self):
@pytest.mark.asyncio
async def test_transfer_with_multiple_input(self):

with open(f'{tmp_dir}/mixin-7001/config.toml', 'r') as f:
with open('/tmp/mixin-7001/config.toml', 'r') as f:
for line in f:
key = 'signer-key = '
start = line.find(key)
Expand All @@ -258,7 +257,7 @@ async def test_transfer_with_multiple_input(self):
break

logger.info('++++signer_key: %s', signer_key)
with open(f'{tmp_dir}/mixin-7001/genesis.json', 'r') as f:
with open('/tmp/mixin-7001/genesis.json', 'r') as f:
genesis = f.read()
genesis = json.loads(genesis)
domain_node = genesis['domains'][0]
Expand Down Expand Up @@ -369,7 +368,7 @@ async def test_transfer_with_multiple_input(self):
@pytest.mark.asyncio
async def test_transfer_with_multiple_input_with_different_keys(self):

with open(f'{tmp_dir}/mixin-7001/config.toml', 'r') as f:
with open('/tmp/mixin-7001/config.toml', 'r') as f:
for line in f:
key = 'signer-key = '
start = line.find(key)
Expand All @@ -380,7 +379,7 @@ async def test_transfer_with_multiple_input_with_different_keys(self):
break

logger.info('++++signer_key: %s', signer_key)
with open(f'{tmp_dir}/mixin-7001/genesis.json', 'r') as f:
with open('/tmp/mixin-7001/genesis.json', 'r') as f:
genesis = f.read()
genesis = json.loads(genesis)
domain_node = genesis['domains'][0]
Expand Down Expand Up @@ -569,7 +568,7 @@ async def monitor():
pass
# asyncio.create_task(monitor())

with open(f'{tmp_dir}/mixin-7001/config.toml', 'r') as f:
with open('/tmp/mixin-7001/config.toml', 'r') as f:
for line in f:
key = 'signer-key = '
start = line.find(key)
Expand All @@ -580,7 +579,7 @@ async def monitor():
break

logger.info('++++signer_key: %s', signer_key)
with open(f'{tmp_dir}/mixin-7001/genesis.json', 'r') as f:
with open('/tmp/mixin-7001/genesis.json', 'r') as f:
genesis = f.read()
genesis = json.loads(genesis)
domain_node = genesis['domains'][0]
Expand Down Expand Up @@ -679,7 +678,7 @@ async def monitor():
pass
# asyncio.create_task(monitor())

with open(f'{tmp_dir}/mixin-7001/config.toml', 'r') as f:
with open('/tmp/mixin-7001/config.toml', 'r') as f:
for line in f:
key = 'signer-key = '
start = line.find(key)
Expand All @@ -690,7 +689,7 @@ async def monitor():
break

logger.info('++++signer_key: %s', signer_key)
with open(f'{tmp_dir}/mixin-7001/genesis.json', 'r') as f:
with open('/tmp/mixin-7001/genesis.json', 'r') as f:
genesis = f.read()
genesis = json.loads(genesis)
domain_node = genesis['domains'][0]
Expand Down Expand Up @@ -794,7 +793,7 @@ async def monitor():
pass
# asyncio.create_task(monitor())

with open(f'{tmp_dir}/mixin-7001/config.toml', 'r') as f:
with open('/tmp/mixin-7001/config.toml', 'r') as f:
for line in f:
key = 'signer-key = '
start = line.find(key)
Expand All @@ -805,7 +804,7 @@ async def monitor():
break

logger.info('++++signer_key: %s', signer_key)
with open(f'{tmp_dir}/mixin-7001/genesis.json', 'r') as f:
with open('/tmp/mixin-7001/genesis.json', 'r') as f:
genesis = f.read()
genesis = json.loads(genesis)
domain_node = genesis['domains'][0]
Expand Down Expand Up @@ -949,7 +948,7 @@ async def monitor():
pass
asyncio.create_task(monitor())

with open(f'{tmp_dir}/mixin-7001/config.toml', 'r') as f:
with open('/tmp/mixin-7001/config.toml', 'r') as f:
for line in f:
key = 'signer-key = '
start = line.find(key)
Expand All @@ -960,7 +959,7 @@ async def monitor():
break

logger.info('++++signer_key: %s', signer_key)
with open(f'{tmp_dir}/mixin-7001/genesis.json', 'r') as f:
with open('/tmp/mixin-7001/genesis.json', 'r') as f:
genesis = f.read()
genesis = json.loads(genesis)
domain_node = genesis['domains'][0]
Expand Down Expand Up @@ -1117,7 +1116,7 @@ async def monitor():
pass
asyncio.create_task(monitor())

with open(f'{tmp_dir}/mixin-7001/config.toml', 'r') as f:
with open('/tmp/mixin-7001/config.toml', 'r') as f:
for line in f:
key = 'signer-key = '
start = line.find(key)
Expand All @@ -1128,7 +1127,7 @@ async def monitor():
break

logger.info('++++signer_key: %s', signer_key)
with open(f'{tmp_dir}/mixin-7001/genesis.json', 'r') as f:
with open('/tmp/mixin-7001/genesis.json', 'r') as f:
genesis = f.read()
genesis = json.loads(genesis)
domain_node = genesis['domains'][0]
Expand Down Expand Up @@ -1291,4 +1290,4 @@ async def monitor():
r = await self.api.send_raw_transaction(r)
r = await self.wait_for_transaction(r['hash'])
logger.info(r)
logger.info('done!')
logger.info('done!')

0 comments on commit 8258f12

Please sign in to comment.