From 01d8372b9f4e20592115afcd5865ffaaf8ba0058 Mon Sep 17 00:00:00 2001
From: kstdl <kostello.d@gmail.com>
Date: Tue, 12 Dec 2017 18:15:55 +0300
Subject: [PATCH] fix some tests. add gitlab-ci.yml

---
 .gitlab-ci.yml                    | 26 ++++++++++++++++++++++++++
 tests/common/database_fixture.cpp |  8 +++-----
 2 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 00000000..9441414a
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -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
\ No newline at end of file
diff --git a/tests/common/database_fixture.cpp b/tests/common/database_fixture.cpp
index 5a04a98b..72beb313 100644
--- a/tests/common/database_fixture.cpp
+++ b/tests/common/database_fixture.cpp
@@ -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 )