Merge branch 'mi_apitests_for_ci' into 'master'

apitests for ci started with cmake and ctest

See merge request !10

ApiTests.cmake

@@ -10,7 +10,7 @@ configure_file("${CMAKE_CURRENT_LIST_DIR}/jsonsocket.py" "${CMAKE_BINARY_DIR}/te
 # @product - hived or hivemind
 macro(ADD_API_TEST common_working_dir directory_with_test product api_name test_name)
     set(working_dir ${CMAKE_BINARY_DIR}/tests)
-    set(api_test_directory ${directory_with_test}/${product}/${api_name})
+    set(api_test_directory ${directory_with_test}/${product}/reference/${api_name})
     set(test_script_path ${api_test_directory}/${test_name}.py)
     message(STATUS "Adding ${api_name}/${test_name} to test list")
     set(extra_macro_args ${ARGN})
@@ -19,10 +19,29 @@ macro(ADD_API_TEST common_working_dir directory_with_test product api_name test_
     if (${num_extra_args} GREATER 0)
         set(test_parameters ${test_script_path} ${TEST_NODE} ${REFERENCE_NODE} ${working_dir} ${extra_macro_args})
     endif()
-    add_test(NAME "api/${api_name}/${test_name}" COMMAND python3 ${test_parameters} WORKING_DIRECTORY ${working_dir})
-    set_property(TEST "api/${api_name}/${test_name}" PROPERTY LABELS python_tests ${api_name} ${test_name})
+    set(test "api/reference/${api_name}/${test_name}")
+    add_test(NAME "${test}" COMMAND python3 ${test_parameters} WORKING_DIRECTORY ${working_dir})
+    set_property(TEST ${test} PROPERTY LABELS api_reference_tests)
 endmacro(ADD_API_TEST)
 
+# @common_working_dir - the root of working directories for all the api test
+# @directory_with_test - full path to tests_api repo on the disk
+# @product - hived or hivemind
+# @blocks - number of synchronized blocks
+# @api_name - full api name i.e. condenser_api
+macro(ADD_API_PYREST_TEST common_working_dir directory_with_test product blocks api_name)
+    # set(working_dir ${CMAKE_BINARY_DIR}/tests)
+    set( pyrest_tests_subdir "pyrest_tests" )
+    set(working_dir ${directory_with_test}/${product}/${pyrest_tests_subdir})
+    set(test_file_path ${directory_with_test}/${product}/${pyrest_tests_subdir}/${blocks}/${api_name}/${api_name}_test.yaml)
+    set(api_test_directory ${directory_with_test}/${product}/${pyrest_tests_subdir}/${api_name})
+    set(test_name "api/pyresttests/${blocks}/${api_name}")
+    message(STATUS "Adding ${test_name}" )
+    set(test_parameters ${test_file_path} "--import_extensions=validator_ex\;comparator_equal")
+    add_test(NAME ${test_name} COMMAND pyresttest ${TEST_NODE} ${test_parameters} WORKING_DIRECTORY ${working_dir})
+    set_property(TEST ${test_name} PROPERTY LABELS "pyresttests")
+endmacro(ADD_API_PYREST_TEST)
+
 # @directory_with_test - full path to tests_api repo on the disk
 # @product - hived or hivemind
 macro(ADD_API_SMOKETEST directory_with_test product)

hived/account_by_key_api/get_key_references.py → hived/reference/account_by_key_api/get_key_references.py

@@ -4,7 +4,7 @@
 import os
 import sys
 
-sys.path.append(os.path.dirname(__file__) + "/../../")
+sys.path.append(os.path.dirname(__file__) + "/../../../")
 
 import json
 from testbase import SimpleJsonTest

hived/account_history_api/enum_virtual_ops.py → hived/reference/account_history_api/enum_virtual_ops.py

@@ -3,7 +3,7 @@
 import os
 import sys
 
-sys.path.append(os.path.dirname(__file__) + "/../../")
+sys.path.append(os.path.dirname(__file__) + "/../../../")
 
 import json
 from testbase import SimpleJsonTest

hived/account_history_api/get_account_history.py → hived/reference/account_history_api/get_account_history.py

@@ -3,7 +3,7 @@
 import os
 import sys
 
-sys.path.append(os.path.dirname(__file__) + "/../../")
+sys.path.append(os.path.dirname(__file__) + "/../../../")
 
 import json
 from testbase import SimpleJsonTest

hived/account_history_api/get_ops_in_block.py → hived/reference/account_history_api/get_ops_in_block.py

@@ -3,7 +3,7 @@
 import os
 import sys
 
-sys.path.append(os.path.dirname(__file__) + "/../../")
+sys.path.append(os.path.dirname(__file__) + "/../../../")
 
 import json
 from testbase import SimpleJsonTest

hived/account_history_api/get_transaction.py → hived/reference/account_history_api/get_transaction.py

@@ -3,7 +3,7 @@
 import os
 import sys
 
-sys.path.append(os.path.dirname(__file__) + "/../../")
+sys.path.append(os.path.dirname(__file__) + "/../../../")
 
 import json
 from testbase import SimpleJsonTest

hived/condenser_api/broadcast_block.py → hived/reference/condenser_api/broadcast_block.py

@@ -3,7 +3,7 @@
 import os
 import sys
 
-sys.path.append(os.path.dirname(__file__) + "/../../")
+sys.path.append(os.path.dirname(__file__) + "/../../../")
 import json
 from testbase import SimpleJsonTest
 

hived/condenser_api/broadcast_transaction.py → hived/reference/condenser_api/broadcast_transaction.py

@@ -3,7 +3,7 @@
 import os
 import sys
 
-sys.path.append(os.path.dirname(__file__) + "/../../")
+sys.path.append(os.path.dirname(__file__) + "/../../../")
 import json
 from testbase import SimpleJsonTest
 

hived/condenser_api/broadcast_transaction_synchronous.py → hived/reference/condenser_api/broadcast_transaction_synchronous.py

@@ -3,7 +3,7 @@
 import os
 import sys
 
-sys.path.append(os.path.dirname(__file__) + "/../../")
+sys.path.append(os.path.dirname(__file__) + "/../../../")
 import json
 from testbase import SimpleJsonTest
 

hived/condenser_api/find_proposals.py → hived/reference/condenser_api/find_proposals.py

@@ -3,7 +3,7 @@
 import os
 import sys
 
-sys.path.append(os.path.dirname(__file__) + "/../../")
+sys.path.append(os.path.dirname(__file__) + "/../../../")
 import json
 from testbase import SimpleJsonTest
 

hived/condenser_api/get_account_count.py → hived/reference/condenser_api/get_account_count.py

@@ -3,7 +3,7 @@
 import os
 import sys
 
-sys.path.append(os.path.dirname(__file__) + "/../../")
+sys.path.append(os.path.dirname(__file__) + "/../../../")
 import json
 from testbase import SimpleJsonTest
 

hived/condenser_api/get_account_history.py → hived/reference/condenser_api/get_account_history.py

@@ -3,7 +3,7 @@
 import os
 import sys
 
-sys.path.append(os.path.dirname(__file__) + "/../../")
+sys.path.append(os.path.dirname(__file__) + "/../../../")
 import json
 from testbase import SimpleJsonTest
 

hived/condenser_api/get_accounts.py → hived/reference/condenser_api/get_accounts.py

@@ -3,7 +3,7 @@
 import os
 import sys
 
-sys.path.append(os.path.dirname(__file__) + "/../../")
+sys.path.append(os.path.dirname(__file__) + "/../../../")
 import json
 from testbase import SimpleJsonTest
 

hived/condenser_api/get_active_witnesses.py → hived/reference/condenser_api/get_active_witnesses.py

@@ -3,7 +3,7 @@
 import os
 import sys
 
-sys.path.append(os.path.dirname(__file__) + "/../../")
+sys.path.append(os.path.dirname(__file__) + "/../../../")
 import json
 from testbase import SimpleJsonTest
 

hived/condenser_api/get_block.py → hived/reference/condenser_api/get_block.py

@@ -3,7 +3,7 @@
 import os
 import sys
 
-sys.path.append(os.path.dirname(__file__) + "/../../")
+sys.path.append(os.path.dirname(__file__) + "/../../../")
 import json
 from testbase import SimpleJsonTest
 

hived/condenser_api/get_block_header.py → hived/reference/condenser_api/get_block_header.py

@@ -3,7 +3,7 @@
 import os
 import sys
 
-sys.path.append(os.path.dirname(__file__) + "/../../")
+sys.path.append(os.path.dirname(__file__) + "/../../../")
 import json
 from testbase import SimpleJsonTest
 

hived/condenser_api/get_chain_properties.py → hived/reference/condenser_api/get_chain_properties.py

@@ -3,7 +3,7 @@
 import os
 import sys
 
-sys.path.append(os.path.dirname(__file__) + "/../../")
+sys.path.append(os.path.dirname(__file__) + "/../../../")
 import json
 from testbase import SimpleJsonTest