kylefang/stacks-puppet-node
1
0
Fork 0
mirror of https://github.com/alexgo-io/stacks-puppet-node.git synced 2026-04-07 22:35:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

add support for vesting lock-ups to the test framework genesis block; do a better job at testing for whether or not we're in a docker container

Browse Source
This commit is contained in:
Jude Nelson
2018-04-19 11:58:51 -04:00
parent d20bbe6fcc
commit ee565cefb4
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
integration_tests/bin/blockstack-test-scenario
View File

@@ -49,6 +49,7 @@ MAX_TEST_LIFETIME = 75 * 60 * 60 # max test run is 75 minutes
TEST_RPC_PORT = 16264
TEST_CLIENT_RPC_PORT = int(os.environ.get("BLOCKSTACK_TEST_CLIENT_RPC_PORT", 16268))
TEST_CLIENT_BIND = os.environ.get("BLOCKSTACK_TEST_CLIENT_BIND", "localhost")
WEB_TEST_BIND = os.environ.get('BLOCKSTACK_WEB_TEST_BIND', 'localhost')
BITCOIND_RPC_ALLOW_IP = os.environ.get("BLOCKSTACK_TEST_BITCOIND_ALLOWIP", False)
@@ -349,7 +350,7 @@ class WebTestServerRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
class WebTestServer(BaseHTTPServer.HTTPServer):
def __init__(self, working_dir, port, test_env):
BaseHTTPServer.HTTPServer.__init__(self, ('localhost', port), WebTestServerRequestHandler)
BaseHTTPServer.HTTPServer.__init__(self, (WEB_TEST_BIND, port), WebTestServerRequestHandler)
self.test_env = test_env
self.done = False
self.working_dir = working_dir
@@ -895,9 +896,19 @@ def run_scenario( virtualchain_working_dir, scenario, config_file, client_config
def running_in_docker():
try:
with open('/proc/1/cpuset') as cpuset:
content = [l for l in cpuset][0]
return content.startswith('/docker')
if os.path.exists('/proc/1/cpuset'):
with open('/proc/1/cpuset') as cpuset:
content = [l for l in cpuset][0]
return content.startswith('/docker')
elif os.path.exists('/proc/1/cgroup'):
with open('/proc/1/cgroup') as cgroup:
for l in cgroup:
try:
l.index('/docker')
return True
except:
pass
except:
return False
@@ -1174,6 +1185,7 @@ def fill_genesis_block(address, token_grant, vesting_schedule):
'type': testlib.TOKEN_TYPE_STACKS,
'value': token_grant,
'vesting': vesting_schedule.get(testlib.TOKEN_TYPE_STACKS, {}),
'lock_send': vesting_schedule.get(testlib.TOKEN_TYPE_STACKS, {}).get('lock_send', 0)
})
for token_type in vesting_schedule:
@@ -1184,7 +1196,8 @@ def fill_genesis_block(address, token_grant, vesting_schedule):
'address': address,
'type': token_type,
'value': 0,
'vesting': vesting_schedule[token_type]
'vesting': vesting_schedule[token_type],
'lock_send': vesting_schedule[token_type].get('lock_send', 0)
})