Skip to content

Commit 8258f12

Browse files
Fix tests
1 parent e9c02bc commit 8258f12

File tree

2 files changed

+33
-30
lines changed

2 files changed

+33
-30
lines changed

.github/workflows/python-app.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,13 @@ jobs:
8282
working-directory: tests
8383
run: |
8484
python -m pip install -r ../requirements-dev.txt
85+
python3 -m pytest -s -x test_mixin_api.py
86+
- name: Test
87+
if: ${{ matrix.os != 'windows-2019' }}
88+
working-directory: tests
89+
run: |
8590
python3 -m pytest -s -x test_testnet2.py -k test_hello
8691
python3 -m pytest -s -x test_testnet2.py -k test_deposit
87-
python3 -m pytest -s -x test_mixin_api.py
8892
- name: auditwheel repair
8993
if: ${{ matrix.os == 'ubuntu-18.04' }}
9094
id: manylinuxwhlfile

tests/test_testnet2.py

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,20 @@
2121

2222
logger = log.get_logger(__name__)
2323

24-
tmp_dir = os.path.dirname(os.path.abspath(__file__)) + '/.tmp'
25-
2624
class TestMixinApi(object):
2725

2826
@classmethod
2927
def setup_class(cls):
3028
cls.nodes = []
3129
# if '--newtestnet' in sys.argv:
32-
for i in range(7):
33-
port = 7001+i
34-
config_dir = f'{tmp_dir}/mixin-{port}'
35-
if os.path.exists(config_dir):
36-
shutil.rmtree(config_dir)
30+
if True:
31+
for i in range(7):
32+
port = 7001+i
33+
config_dir = f'/tmp/mixin-{port}'
34+
if os.path.exists(config_dir):
35+
shutil.rmtree(config_dir)
3736

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

4544
for i in range(7):
4645
port = 7001+i
47-
# cmd = f'python3 -m mixin.main kernel -dir {tmp_dir}/mixin-700{i+1} -port {port}'
48-
cmd = f'python3 -m pymixin.main kernel -dir {tmp_dir}/mixin-700{i+1} -port {port}'
49-
# cmd = f'/Users/newworld/dev/mixin/mixin/mixin kernel -dir {tmp_dir}/mixin-700{i+1} -port {port}'
46+
# cmd = f'python3 -m mixin.main kernel -dir /tmp/mixin-700{i+1} -port {port}'
47+
cmd = f'python3 -m pymixin.main kernel -dir /tmp/mixin-700{i+1} -port {port}'
48+
# cmd = f'/Users/newworld/dev/mixin/mixin/mixin kernel -dir /tmp/mixin-700{i+1} -port {port}'
5049
logger.info(cmd)
5150
args = shlex.split(cmd)
52-
log = open(f'{tmp_dir}/mixin-700{i+1}/log.txt', 'a')
51+
log = open(f'/tmp/mixin-700{i+1}/log.txt', 'a')
5352
p = subprocess.Popen(args, stdout=log, stderr=log)
5453
cls.nodes.append(p)
5554
logger.info('++++++')
@@ -100,7 +99,7 @@ async def test_hello(self):
10099

101100
@pytest.mark.asyncio
102101
async def test_deposit(self):
103-
with open(f'{tmp_dir}/mixin-7001/config.toml', 'r') as f:
102+
with open('/tmp/mixin-7001/config.toml', 'r') as f:
104103
for line in f:
105104
key = 'signer-key = '
106105
start = line.find(key)
@@ -111,7 +110,7 @@ async def test_deposit(self):
111110
break
112111

113112
logger.info('++++signer_key: %s', signer_key)
114-
with open(f'{tmp_dir}/mixin-7001/genesis.json', 'r') as f:
113+
with open('/tmp/mixin-7001/genesis.json', 'r') as f:
115114
genesis = f.read()
116115
genesis = json.loads(genesis)
117116
domain_node = genesis['domains'][0]
@@ -247,7 +246,7 @@ async def test_deposit(self):
247246
@pytest.mark.asyncio
248247
async def test_transfer_with_multiple_input(self):
249248

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

260259
logger.info('++++signer_key: %s', signer_key)
261-
with open(f'{tmp_dir}/mixin-7001/genesis.json', 'r') as f:
260+
with open('/tmp/mixin-7001/genesis.json', 'r') as f:
262261
genesis = f.read()
263262
genesis = json.loads(genesis)
264263
domain_node = genesis['domains'][0]
@@ -369,7 +368,7 @@ async def test_transfer_with_multiple_input(self):
369368
@pytest.mark.asyncio
370369
async def test_transfer_with_multiple_input_with_different_keys(self):
371370

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

382381
logger.info('++++signer_key: %s', signer_key)
383-
with open(f'{tmp_dir}/mixin-7001/genesis.json', 'r') as f:
382+
with open('/tmp/mixin-7001/genesis.json', 'r') as f:
384383
genesis = f.read()
385384
genesis = json.loads(genesis)
386385
domain_node = genesis['domains'][0]
@@ -569,7 +568,7 @@ async def monitor():
569568
pass
570569
# asyncio.create_task(monitor())
571570

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

582581
logger.info('++++signer_key: %s', signer_key)
583-
with open(f'{tmp_dir}/mixin-7001/genesis.json', 'r') as f:
582+
with open('/tmp/mixin-7001/genesis.json', 'r') as f:
584583
genesis = f.read()
585584
genesis = json.loads(genesis)
586585
domain_node = genesis['domains'][0]
@@ -679,7 +678,7 @@ async def monitor():
679678
pass
680679
# asyncio.create_task(monitor())
681680

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

692691
logger.info('++++signer_key: %s', signer_key)
693-
with open(f'{tmp_dir}/mixin-7001/genesis.json', 'r') as f:
692+
with open('/tmp/mixin-7001/genesis.json', 'r') as f:
694693
genesis = f.read()
695694
genesis = json.loads(genesis)
696695
domain_node = genesis['domains'][0]
@@ -794,7 +793,7 @@ async def monitor():
794793
pass
795794
# asyncio.create_task(monitor())
796795

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

807806
logger.info('++++signer_key: %s', signer_key)
808-
with open(f'{tmp_dir}/mixin-7001/genesis.json', 'r') as f:
807+
with open('/tmp/mixin-7001/genesis.json', 'r') as f:
809808
genesis = f.read()
810809
genesis = json.loads(genesis)
811810
domain_node = genesis['domains'][0]
@@ -949,7 +948,7 @@ async def monitor():
949948
pass
950949
asyncio.create_task(monitor())
951950

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

962961
logger.info('++++signer_key: %s', signer_key)
963-
with open(f'{tmp_dir}/mixin-7001/genesis.json', 'r') as f:
962+
with open('/tmp/mixin-7001/genesis.json', 'r') as f:
964963
genesis = f.read()
965964
genesis = json.loads(genesis)
966965
domain_node = genesis['domains'][0]
@@ -1117,7 +1116,7 @@ async def monitor():
11171116
pass
11181117
asyncio.create_task(monitor())
11191118

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

11301129
logger.info('++++signer_key: %s', signer_key)
1131-
with open(f'{tmp_dir}/mixin-7001/genesis.json', 'r') as f:
1130+
with open('/tmp/mixin-7001/genesis.json', 'r') as f:
11321131
genesis = f.read()
11331132
genesis = json.loads(genesis)
11341133
domain_node = genesis['domains'][0]
@@ -1291,4 +1290,4 @@ async def monitor():
12911290
r = await self.api.send_raw_transaction(r)
12921291
r = await self.wait_for_transaction(r['hash'])
12931292
logger.info(r)
1294-
logger.info('done!')
1293+
logger.info('done!')

0 commit comments

Comments
 (0)