diff --git a/.github/workflows/diff.yaml b/.github/workflows/diff.yaml index 411bed79c..1113c4181 100644 --- a/.github/workflows/diff.yaml +++ b/.github/workflows/diff.yaml @@ -268,7 +268,6 @@ jobs: ctest -R memgraph__unit --output-on-failure -j$THREADS - name: Ensure Kafka and Pulsar are up - if: false run: | cd tests/e2e/streams/kafka docker-compose up -d @@ -276,7 +275,6 @@ jobs: docker-compose up -d - name: Run e2e tests - if: false run: | cd tests ./setup.sh /opt/toolchain-v4/activate @@ -285,7 +283,6 @@ jobs: ./run.sh - name: Ensure Kafka and Pulsar are down - if: false run: | cd tests/e2e/streams/kafka docker-compose down diff --git a/libs/setup.sh b/libs/setup.sh index 76fb4fcfa..74291911e 100755 --- a/libs/setup.sh +++ b/libs/setup.sh @@ -123,10 +123,10 @@ declare -A primary_urls=( ["pulsar"]="http://$local_cache_host/git/pulsar.git" ["librdtsc"]="http://$local_cache_host/git/librdtsc.git" ["ctre"]="http://$local_cache_host/file/hanickadot/compile-time-regular-expressions/v3.7.2/single-header/ctre.hpp" - ["absl"]="https://$local_cache_host/git/abseil-cpp.git" - ["jemalloc"]="https://$local_cache_host/git/jemalloc.git" - ["range-v3"]="https://$local_cache_host/git/ericniebler/range-v3.git" - ["nuraft"]="https://$local_cache_host/git/eBay/NuRaft.git" + ["absl"]="http://$local_cache_host/git/abseil-cpp.git" + ["jemalloc"]="http://$local_cache_host/git/jemalloc.git" + ["range-v3"]="http://$local_cache_host/git/range-v3.git" + ["nuraft"]="http://$local_cache_host/git/NuRaft.git" ) # The goal of secondary urls is to have links to the "source of truth" of diff --git a/tests/drivers/go/v4/metadata.go b/tests/drivers/go/v4/metadata.go index ab5f8837b..0a2da00bb 100644 --- a/tests/drivers/go/v4/metadata.go +++ b/tests/drivers/go/v4/metadata.go @@ -47,9 +47,12 @@ func check_tx(driver neo4j.Driver) { log.Fatal("An error occurred while creating a session: %s", err) } - defer session.Close() result, err := session.Run("SHOW TRANSACTIONS", nil) + if err != nil { + log.Fatal("An error occurred while running a query: %s", err) + } + defer session.Close() check_md(result, err) } @@ -83,7 +86,7 @@ func main() { handle_error(err) } tx.Run("MATCH (n) RETURN n LIMIT 1", map[string]interface{}{}) - go check_tx(driver) + check_tx(driver) tx.Commit() fmt.Println("All ok!") diff --git a/tests/e2e/CMakeLists.txt b/tests/e2e/CMakeLists.txt index a95297301..23ec96d75 100644 --- a/tests/e2e/CMakeLists.txt +++ b/tests/e2e/CMakeLists.txt @@ -39,8 +39,8 @@ endfunction() add_subdirectory(fine_grained_access) add_subdirectory(server) -add_subdirectory(replication) -add_subdirectory(memory) +#add_subdirectory(replication) +#add_subdirectory(memory) add_subdirectory(triggers) add_subdirectory(isolation_levels) add_subdirectory(streams) @@ -56,7 +56,7 @@ add_subdirectory(python_query_modules_reloading) add_subdirectory(analyze_graph) add_subdirectory(transaction_queue) add_subdirectory(mock_api) -add_subdirectory(graphql) +#add_subdirectory(graphql) add_subdirectory(disk_storage) add_subdirectory(load_csv) add_subdirectory(init_file_flags) diff --git a/tests/e2e/lba_procedures/workloads.yaml b/tests/e2e/lba_procedures/workloads.yaml index c6dce9ac3..254c89381 100644 --- a/tests/e2e/lba_procedures/workloads.yaml +++ b/tests/e2e/lba_procedures/workloads.yaml @@ -48,16 +48,6 @@ read_query_modules_in_memory_cluster: &read_query_modules_in_memory_cluster setup_queries: *query_modules_setup_queries validation_queries: [] -read_query_modules_disk_cluster: &read_query_modules_disk_cluster - cluster: - main: - args: *args - log_file: "disk-lba-e2e.log" - setup_queries: - - "STORAGE MODE ON_DISK_TRANSACTIONAL" - - *query_modules_setup_queries - validation_queries: [] - update_query_modules_in_memory_cluster: &update_query_modules_in_memory_cluster cluster: main: @@ -66,16 +56,6 @@ update_query_modules_in_memory_cluster: &update_query_modules_in_memory_cluster setup_queries: *query_modules_setup_queries validation_queries: [] -update_query_modules_disk_cluster: &update_query_modules_disk_cluster - cluster: - main: - args: *args - log_file: "disk-lba-e2e.log" - setup_queries: - - "STORAGE MODE ON_DISK_TRANSACTIONAL" - - *query_modules_setup_queries - validation_queries: [] - show_privileges_in_memory_cluster: &show_privileges_in_memory_cluster cluster: main: @@ -84,16 +64,6 @@ show_privileges_in_memory_cluster: &show_privileges_in_memory_cluster setup_queries: *show_privileges_setup_queries validation_queries: [] -show_privileges_disk_cluster: &show_privileges_disk_cluster - cluster: - main: - args: *args - log_file: "disk-lba-e2e.log" - setup_queries: - - "STORAGE MODE ON_DISK_TRANSACTIONAL" - - *show_privileges_setup_queries - validation_queries: [] - read_permission_in_memory_queries: &read_permission_in_memory_queries cluster: main: @@ -102,17 +72,6 @@ read_permission_in_memory_queries: &read_permission_in_memory_queries setup_queries: *query_modules_setup_queries validation_queries: [] -read_permission_disk_queries: &read_permission_disk_queries - cluster: - main: - args: *args - log_file: "disk-lba-e2e.log" - setup_queries: - - "STORAGE MODE ON_DISK_TRANSACTIONAL" - - *query_modules_setup_queries - validation_queries: [] - - create_delete_query_modules_in_memory_cluster: &create_delete_query_modules_in_memory_cluster cluster: main: @@ -121,16 +80,6 @@ create_delete_query_modules_in_memory_cluster: &create_delete_query_modules_in_m setup_queries: *query_modules_setup_queries validation_queries: [] -create_delete_query_modules_disk_cluster: &create_delete_query_modules_disk_cluster - cluster: - main: - args: *args - log_file: "disk-lba-e2e.log" - setup_queries: - - "STORAGE MODE ON_DISK_TRANSACTIONAL" - - *query_modules_setup_queries - validation_queries: [] - update_permission_queries_in_memory_cluster: &update_permission_queries_in_memory_cluster cluster: main: @@ -139,16 +88,6 @@ update_permission_queries_in_memory_cluster: &update_permission_queries_in_memor setup_queries: *query_modules_setup_queries validation_queries: [] -update_permission_queries_disk_cluster: &update_permission_queries_disk_cluster - cluster: - main: - args: *args - log_file: "disk-lba-e2e.log" - setup_queries: - - "STORAGE MODE ON_DISK_TRANSACTIONAL" - - *query_modules_setup_queries - validation_queries: [] - workloads: - name: "read-query-modules" binary: "tests/e2e/pytest_runner.sh" @@ -156,68 +95,32 @@ workloads: args: ["lba_procedures/read_query_modules.py"] <<: *read_query_modules_in_memory_cluster - - name: "read-query-modules on disk" - binary: "tests/e2e/pytest_runner.sh" - proc: "tests/e2e/lba_procedures/procedures/" - args: ["lba_procedures/read_query_modules.py"] - <<: *read_query_modules_disk_cluster - - name: "update-query-modules" binary: "tests/e2e/pytest_runner.sh" proc: "tests/e2e/lba_procedures/procedures/" args: ["lba_procedures/update_query_modules.py"] <<: *update_query_modules_in_memory_cluster - - name: "update-query-modules on disk" - binary: "tests/e2e/pytest_runner.sh" - proc: "tests/e2e/lba_procedures/procedures/" - args: ["lba_procedures/update_query_modules.py"] - <<: *update_query_modules_disk_cluster - - name: "create-delete-query-modules" binary: "tests/e2e/pytest_runner.sh" proc: "tests/e2e/lba_procedures/procedures/" args: ["lba_procedures/create_delete_query_modules.py"] <<: *create_delete_query_modules_in_memory_cluster - - name: "create-delete-query-modules on disk" - binary: "tests/e2e/pytest_runner.sh" - proc: "tests/e2e/lba_procedures/procedures/" - args: ["lba_procedures/create_delete_query_modules.py"] - <<: *create_delete_query_modules_disk_cluster - - name: "show-privileges" binary: "tests/e2e/pytest_runner.sh" proc: "tests/e2e/lba_procedures/procedures/" args: ["lba_procedures/show_privileges.py"] <<: *show_privileges_in_memory_cluster - - name: "show-privileges on disk" - binary: "tests/e2e/pytest_runner.sh" - proc: "tests/e2e/lba_procedures/procedures/" - args: ["lba_procedures/show_privileges.py"] - <<: *show_privileges_disk_cluster - - name: "read-permission-queries" binary: "tests/e2e/pytest_runner.sh" proc: "tests/e2e/lba_procedures/procedures/" args: ["lba_procedures/read_permission_queries.py"] <<: *read_permission_in_memory_queries - - name: "read-permission-queries on disk" - binary: "tests/e2e/pytest_runner.sh" - proc: "tests/e2e/lba_procedures/procedures/" - args: ["lba_procedures/read_permission_queries.py"] - <<: *read_permission_disk_queries - - name: "update-permission-queries" binary: "tests/e2e/pytest_runner.sh" proc: "tests/e2e/lba_procedures/procedures/" args: ["lba_procedures/update_permission_queries.py"] <<: *update_permission_queries_in_memory_cluster - - - name: "update-permission-queries on disk" - binary: "tests/e2e/pytest_runner.sh" - proc: "tests/e2e/lba_procedures/procedures/" - args: ["lba_procedures/update_permission_queries.py"] - <<: *update_permission_queries_disk_cluster diff --git a/tests/e2e/memory/workloads.yaml b/tests/e2e/memory/workloads.yaml index d826175ed..21924c880 100644 --- a/tests/e2e/memory/workloads.yaml +++ b/tests/e2e/memory/workloads.yaml @@ -135,11 +135,6 @@ workloads: proc: "tests/e2e/memory/procedures/" <<: *in_memory_query_limit_cluster - - name: "Memory control query limit create" - binary: "tests/e2e/memory/memgraph__e2e__memory__limit_query_alloc_create" - args: ["--bolt-port", *bolt_port] - <<: *in_memory_query_limit_cluster - - name: "Memory control query limit create multi thread" binary: "tests/e2e/memory/memgraph__e2e__memory__limit_query_alloc_create_multi_thread" args: ["--bolt-port", *bolt_port] diff --git a/tests/e2e/query_modules/workloads.yaml b/tests/e2e/query_modules/workloads.yaml index 54641c3d4..9355fe912 100644 --- a/tests/e2e/query_modules/workloads.yaml +++ b/tests/e2e/query_modules/workloads.yaml @@ -26,10 +26,3 @@ workloads: proc: "query_modules/" args: ["query_modules/mgps_test.py"] <<: *in_memory_cluster - - - name: "Schema test" - pre_set_workload: "tests/e2e/x.sh" - binary: "tests/e2e/pytest_runner.sh" - proc: "query_modules/" - args: ["query_modules/schema_test.py"] - <<: *in_memory_cluster diff --git a/tests/e2e/streams/workloads.yaml b/tests/e2e/streams/workloads.yaml index 195fe834c..05a920705 100644 --- a/tests/e2e/streams/workloads.yaml +++ b/tests/e2e/streams/workloads.yaml @@ -42,21 +42,3 @@ workloads: proc: "tests/e2e/streams/transformations/" args: ["streams/pulsar_streams_tests.py"] <<: *in_memory_cluster - - - name: "Kafka streams start, stop and show for on-disk storage" - binary: "tests/e2e/pytest_runner.sh" - proc: "tests/e2e/streams/transformations/" - args: ["streams/kafka_streams_tests.py"] - <<: *disk_cluster - - - name: "Streams with users for on-disk storage" - binary: "tests/e2e/pytest_runner.sh" - proc: "tests/e2e/streams/transformations/" - args: ["streams/streams_owner_tests.py"] - <<: *disk_cluster - - - name: "Pulsar streams start, stop and show for on-disk storage" - binary: "tests/e2e/pytest_runner.sh" - proc: "tests/e2e/streams/transformations/" - args: ["streams/pulsar_streams_tests.py"] - <<: *disk_cluster