Merge branch 'add-timescaledb-tests' of https://github.com/bonicim/vo…

…lttron into bonicim-add-timescaledb-tests
VOLTTRON · Sep 26, 2020 · 081242f · 081242f
2 parents 85e8e82 + c30598b
commit 081242f
Show file tree

Hide file tree

Showing 3 changed files with 854 additions and 1 deletion.
diff --git a/ci-integration/run-test-docker.sh b/ci-integration/run-test-docker.sh
@@ -72,7 +72,6 @@ run_test(){
     docker run -e "IGNORE_ENV_CHECK=1" -e "CI=$CI" --name "$base_filename" \
             -t --network="host" -v /var/run/docker.sock:/var/run/docker.sock volttron_test_image \
             pytest "$filename" > "$base_filename.result.txt" 2>&1 &
-
     runningprocs+=($!)
     outputfiles+=("$base_filename.result.txt")
     containernames+=("$base_filename")

diff --git a/pytest.ini b/pytest.ini
@@ -55,5 +55,6 @@ markers =
         secure: Test platform and agents with secure platform options
         rpc: Tests for RPC
         mysqlfuncts: level one integration tests for mysqlfuncts
+        postgresqlfuncts_timescaledb: level one integreation tests for timescaledb
         postgresqlfuncts: level one integration tests for postgresqlfuncts
         dbutils: test all the level one integrations tests for dbfuncts classes