Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

fix some tests. add gitlab-ci.yml

Browse source
This commit is contained in:
kstdl 2017-12-12 18:15:55 +03:00 committed by gladcow
parent ee9545a2c4
commit 01d8372b9f
2 changed files with 29 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
.gitlab-ci.yml Normal file
View file

@ -0,0 +1,26 @@
stages:
- build
- test
before_script:
- cd /var/www/Projects/595.peerplays/blockchain
buildjob:
stage: build
script:
- cmake .
- make
only:
- master
tags:
- pp-dev
testjob:
stage: test
script:
- ./tests/chain_test
- ./tests/tournament_test
only:
- master
tags:
- pp-dev

8
tests/common/database_fixture.cpp
View file

@ -89,11 +89,9 @@ database_fixture::database_fixture()
boost::program_options::variables_map options;
genesis_state.initial_timestamp = time_point_sec( GRAPHENE_TESTING_GENESIS_TIMESTAMP );
//int back_to_the_past = 0;
//back_to_the_past = 7 * 24 * 60 * 60; // week
//genesis_state.initial_timestamp = time_point_sec( (fc::time_point::now().sec_since_epoch() - back_to_the_past) / GRAPHENE_DEFAULT_BLOCK_INTERVAL * GRAPHENE_DEFAULT_BLOCK_INTERVAL );
genesis_state.initial_parameters.witness_schedule_algorithm = GRAPHENE_WITNESS_SHUFFLED_ALGORITHM;
// genesis_state.initial_timestamp = time_point_sec( GRAPHENE_TESTING_GENESIS_TIMESTAMP );
genesis_state.initial_timestamp = time_point_sec( (fc::time_point::now().sec_since_epoch() / GRAPHENE_DEFAULT_BLOCK_INTERVAL) * GRAPHENE_DEFAULT_BLOCK_INTERVAL );
// genesis_state.initial_parameters.witness_schedule_algorithm = GRAPHENE_WITNESS_SHUFFLED_ALGORITHM;
genesis_state.initial_active_witnesses = 10;
for( unsigned i = 0; i < genesis_state.initial_active_witnesses; ++i )