Remove unused files
This commit is contained in:
Daniel García Aubert
parent
24572f63a2
commit
986e761567
47
Makefile
47
Makefile
@ -1,47 +0,0 @@
|
||||
SHELL=/bin/bash
|
||||
|
||||
all:
|
||||
npm install
|
||||
|
||||
clean:
|
||||
rm -rf node_modules/*
|
||||
|
||||
check:
|
||||
npm test
|
||||
|
||||
eslint:
|
||||
@echo "***eslint***"
|
||||
@./node_modules/.bin/eslint lib/**/*.js test/**/*.js app.js
|
||||
|
||||
TEST_SUITE := $(shell find test/{unit,integration,acceptance} -name "*.js")
|
||||
TEST_SUITE_UNIT := $(shell find test/unit -name "*.js")
|
||||
TEST_SUITE_INTEGRATION := $(shell find test/integration -name "*.js")
|
||||
TEST_SUITE_ACCEPTANCE := $(shell find test/acceptance -name "*.js")
|
||||
TEST_SUITE_BATCH := $(shell find test/*/batch -name "*.js")
|
||||
|
||||
test:
|
||||
@echo "***tests***"
|
||||
@$(SHELL) test/run_tests.sh ${RUNTESTFLAGS} $(TEST_SUITE)
|
||||
|
||||
test-unit:
|
||||
@echo "***unit tests***"
|
||||
@$(SHELL) test/run_tests.sh ${RUNTESTFLAGS} $(TEST_SUITE_UNIT)
|
||||
|
||||
test-integration:
|
||||
@echo "***integration tests***"
|
||||
@$(SHELL) test/run_tests.sh ${RUNTESTFLAGS} $(TEST_SUITE_INTEGRATION)
|
||||
|
||||
test-acceptance:
|
||||
@echo "***acceptance tests***"
|
||||
@$(SHELL) test/run_tests.sh ${RUNTESTFLAGS} $(TEST_SUITE_ACCEPTANCE)
|
||||
|
||||
test-batch:
|
||||
@echo "***batch queries tests***"
|
||||
@$(SHELL) test/run_tests.sh ${RUNTESTFLAGS} $(TEST_SUITE_BATCH)
|
||||
|
||||
test-all: test eslint
|
||||
|
||||
coverage:
|
||||
@RUNTESTFLAGS=--with-coverage make test
|
||||
|
||||
.PHONY: test coverage
|
||||
36
configure
vendored
36
configure
vendored
@ -1,36 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
usage() {
|
||||
echo "Usage: $0 [OPTION]"
|
||||
echo
|
||||
echo "Configuration:"
|
||||
echo " --help display this help and exit"
|
||||
echo " --with-pgport=NUM access PostgreSQL server on TCP port NUM"
|
||||
}
|
||||
|
||||
PGPORT=5432
|
||||
|
||||
while test -n "$1"; do
|
||||
case "$1" in
|
||||
--help|-h)
|
||||
usage
|
||||
exit 0
|
||||
;;
|
||||
--with-pgport=*)
|
||||
PGPORT=`echo "$1" | cut -d= -f2`
|
||||
;;
|
||||
*)
|
||||
echo "Unused option '$1'" >&2
|
||||
;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
|
||||
echo "PGPORT: $PGPORT"
|
||||
|
||||
# TODO: allow specifying configuration settings !
|
||||
for f in config/environments/*.example; do
|
||||
o=`dirname "$f"`/`basename "$f" .example`
|
||||
echo "Writing $o"
|
||||
sed "s/\( *module.exports.db_port[ \t]*= *'\?\)[^';]*\('\?;\)/\1$PGPORT\2/" < "$f" > "$o"
|
||||
done
|
||||
@ -1,13 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
echo "*********************"
|
||||
echo "To install Node.js, run:"
|
||||
echo "/src/nodejs-install.sh"
|
||||
echo "Use NODEJS_VERSION env var to select the Node.js version"
|
||||
echo " "
|
||||
echo "To start postgres, run:"
|
||||
echo "/etc/init.d/postgresql start"
|
||||
echo "*********************"
|
||||
echo " "
|
||||
|
||||
docker run -it -v `pwd`:/srv carto/nodejs-xenial-pg101:latest bash
|
||||
@ -1,4 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
docker run -e "NODEJS_VERSION=${2}" -v `pwd`:/srv ${1} bash test/run_tests_docker.sh && \
|
||||
docker ps --filter status=dead --filter status=exited -aq | xargs docker rm -v
|
||||
@ -1,223 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
# this script prepare database and redis instance to run acceptance test
|
||||
#
|
||||
# NOTE: assumes existance of a "template_postgis" loaded with
|
||||
# compatible version of postgis (legacy.sql included)
|
||||
|
||||
PREPARE_REDIS=yes
|
||||
PREPARE_PGSQL=yes
|
||||
|
||||
while [ -n "$1" ]; do
|
||||
if test "$1" = "--skip-pg"; then
|
||||
PREPARE_PGSQL=no
|
||||
shift; continue
|
||||
elif test "$1" = "--skip-redis"; then
|
||||
PREPARE_REDIS=no
|
||||
shift; continue
|
||||
fi
|
||||
done
|
||||
|
||||
die() {
|
||||
msg=$1
|
||||
echo "${msg}" >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
# This is where postgresql connection parameters are read from
|
||||
TESTENV=../config/environments/test.js
|
||||
|
||||
# Extract postgres configuration
|
||||
PGHOST=`node -e "console.log(require('${TESTENV}').db_host || '')"`
|
||||
echo "PGHOST: [$PGHOST]"
|
||||
PGPORT=`node -e "console.log(require('${TESTENV}').db_port || '')"`
|
||||
echo "PGPORT: [$PGPORT]"
|
||||
|
||||
PUBLICUSER=`node -e "console.log(require('${TESTENV}').db_pubuser || 'xxx')"`
|
||||
PUBLICPASS=`node -e "console.log(require('${TESTENV}').db_pubuser_pass || 'xxx')"`
|
||||
echo "PUBLICUSER: [${PUBLICUSER}]"
|
||||
echo "PUBLICPASS: [${PUBLICPASS}]"
|
||||
|
||||
|
||||
TESTUSERID=1
|
||||
|
||||
TESTUSER=`node -e "console.log(require('${TESTENV}').db_user || '')"`
|
||||
if test -z "$TESTUSER"; then
|
||||
echo "Missing db_user from ${TESTENV}" >&2
|
||||
exit 1
|
||||
fi
|
||||
TESTUSER=`echo ${TESTUSER} | sed "s/<%= user_id %>/${TESTUSERID}/"`
|
||||
echo "TESTUSER: [${TESTUSER}]"
|
||||
|
||||
TESTPASS=`node -e "console.log(require('${TESTENV}').db_user_pass || '')"`
|
||||
TESTPASS=`echo ${TESTPASS} | sed "s/<%= user_id %>/${TESTUSERID}/"`
|
||||
echo "TESTPASS: [${TESTPASS}]"
|
||||
|
||||
TEST_DB=`node -e "console.log(require('${TESTENV}').db_base_name || '')"`
|
||||
if test -z "$TEST_DB"; then
|
||||
echo "Missing db_base_name from ${TESTENV}" >&2
|
||||
exit 1
|
||||
fi
|
||||
TEST_DB=`echo ${TEST_DB} | sed "s/<%= user_id %>/${TESTUSERID}/"`
|
||||
|
||||
export PGHOST PGPORT
|
||||
|
||||
if test x"$PREPARE_PGSQL" = xyes; then
|
||||
|
||||
echo "preparing postgres..."
|
||||
echo "PostgreSQL server version: `psql -A -t -c 'select version()'`"
|
||||
echo "PAUSE; RESUME;" | psql pgbouncer 2>/dev/null # make sure there are no connections pgbouncer -> test_db
|
||||
dropdb --if-exists ${TEST_DB} || die "Could not drop test database ${TEST_DB}"
|
||||
createdb -Ttemplate_postgis -EUTF8 ${TEST_DB} || die "Could not create test database ${TEST_DB}"
|
||||
psql -c 'CREATE EXTENSION IF NOT EXISTS "uuid-ossp";' ${TEST_DB}
|
||||
psql -c "CREATE EXTENSION IF NOT EXISTS cartodb CASCADE;" ${TEST_DB}
|
||||
|
||||
LOCAL_SQL_SCRIPTS='test populated_places_simple_reduced py_sleep quota_mock'
|
||||
for i in ${LOCAL_SQL_SCRIPTS}
|
||||
do
|
||||
cat support/sql/${i}.sql |
|
||||
sed -e 's/cartodb\./public./g' -e "s/''cartodb''/''public''/g" |
|
||||
sed "s/:PUBLICUSER/${PUBLICUSER}/" |
|
||||
sed "s/:PUBLICPASS/${PUBLICPASS}/" |
|
||||
sed "s/:TESTUSER/${TESTUSER}/" |
|
||||
sed "s/:TESTPASS/${TESTPASS}/" |
|
||||
psql -q -v ON_ERROR_STOP=1 ${TEST_DB} > /dev/null || exit 1
|
||||
done
|
||||
|
||||
fi
|
||||
|
||||
if test x"$PREPARE_REDIS" = xyes; then
|
||||
|
||||
REDIS_HOST=`node -e "console.log(require('${TESTENV}').redis_host || '127.0.0.1')"`
|
||||
REDIS_PORT=`node -e "console.log(require('${TESTENV}').redis_port || '6336')"`
|
||||
|
||||
echo "preparing redis..."
|
||||
|
||||
# delete previous publicuser
|
||||
cat <<EOF | redis-cli -h ${REDIS_HOST} -p ${REDIS_PORT} -n 5
|
||||
HDEL rails:users:vizzuality database_host
|
||||
HDEL rails:users:vizzuality database_publicuser
|
||||
EOF
|
||||
|
||||
cat <<EOF | redis-cli -h ${REDIS_HOST} -p ${REDIS_PORT} -n 5
|
||||
HMSET rails:users:vizzuality \
|
||||
id 1 \
|
||||
database_name ${TEST_DB} \
|
||||
database_host ${PGHOST} \
|
||||
map_key 1234
|
||||
SADD rails:users:vizzuality:map_key 1235
|
||||
EOF
|
||||
|
||||
# A user configured as with cartodb-2.5.0+
|
||||
cat <<EOF | redis-cli -h ${REDIS_HOST} -p ${REDIS_PORT} -n 5
|
||||
HMSET rails:users:cartodb250user \
|
||||
id ${TESTUSERID} \
|
||||
database_name ${TEST_DB} \
|
||||
database_host ${PGHOST} \
|
||||
database_password ${TESTPASS} \
|
||||
map_key 1234
|
||||
SADD rails:users:cartodb250user:map_key 1234
|
||||
EOF
|
||||
|
||||
cat <<EOF | redis-cli -h ${REDIS_HOST} -p ${REDIS_PORT} -n 3
|
||||
HMSET rails:oauth_access_tokens:l0lPbtP68ao8NfStCiA3V3neqfM03JKhToxhUQTR \
|
||||
consumer_key fZeNGv5iYayvItgDYHUbot1Ukb5rVyX6QAg8GaY2 \
|
||||
consumer_secret IBLCvPEefxbIiGZhGlakYV4eM8AbVSwsHxwEYpzx \
|
||||
access_token_token l0lPbtP68ao8NfStCiA3V3neqfM03JKhToxhUQTR \
|
||||
access_token_secret 22zBIek567fMDEebzfnSdGe8peMFVFqAreOENaDK \
|
||||
user_id 1 \
|
||||
time sometime
|
||||
EOF
|
||||
|
||||
cat <<EOF | redis-cli -h ${REDIS_HOST} -p ${REDIS_PORT} -n 5
|
||||
HMSET rails:users:cartofante \
|
||||
id 2 \
|
||||
database_name ${TEST_DB} \
|
||||
database_host ${PGHOST} \
|
||||
database_password test_cartodb_user_2_pass \
|
||||
map_key 4321
|
||||
SADD rails:users:fallback_1:map_key 4321
|
||||
EOF
|
||||
|
||||
# delete previous jobs
|
||||
cat <<EOF | redis-cli -h ${REDIS_HOST} -p ${REDIS_PORT} -n 5
|
||||
EVAL "return redis.call('del', unpack(redis.call('keys', ARGV[1])))" 0 batch:jobs:*
|
||||
EOF
|
||||
|
||||
# delete job queue
|
||||
cat <<EOF | redis-cli -h ${REDIS_HOST} -p ${REDIS_PORT} -n 5
|
||||
DEL batch:queues:localhost
|
||||
EOF
|
||||
|
||||
# delete user index
|
||||
cat <<EOF | redis-cli -h ${REDIS_HOST} -p ${REDIS_PORT} -n 5
|
||||
DEL batch:users:vizzuality
|
||||
EOF
|
||||
|
||||
# User: vizzuality
|
||||
|
||||
# API Key Default public
|
||||
cat <<EOF | redis-cli -h ${REDIS_HOST} -p ${REDIS_PORT} -n 5
|
||||
HMSET api_keys:vizzuality:default_public \
|
||||
user "vizzuality" \
|
||||
type "default" \
|
||||
grants_sql "true" \
|
||||
database_role "testpublicuser" \
|
||||
database_password "public"
|
||||
EOF
|
||||
|
||||
# API Key Master
|
||||
cat <<EOF | redis-cli -h ${REDIS_HOST} -p ${REDIS_PORT} -n 5
|
||||
HMSET api_keys:vizzuality:1234 \
|
||||
user "vizzuality" \
|
||||
type "master" \
|
||||
grants_sql "true" \
|
||||
database_role "${TESTUSER}" \
|
||||
database_password "${TESTPASS}"
|
||||
EOF
|
||||
|
||||
# API Key Regular1
|
||||
cat <<EOF | redis-cli -p ${REDIS_PORT} -n 5
|
||||
HMSET api_keys:vizzuality:regular1 \
|
||||
user "vizzuality" \
|
||||
type "regular" \
|
||||
grants_sql "true" \
|
||||
database_role "regular_1" \
|
||||
database_password "regular1"
|
||||
EOF
|
||||
|
||||
# API Key Regular1
|
||||
cat <<EOF | redis-cli -p ${REDIS_PORT} -n 5
|
||||
HMSET api_keys:vizzuality:regular2 \
|
||||
user "vizzuality" \
|
||||
type "regular" \
|
||||
grants_sql "true" \
|
||||
database_role "regular_2" \
|
||||
database_password "regular2"
|
||||
EOF
|
||||
|
||||
# User: cartodb250user
|
||||
|
||||
# API Key Default public
|
||||
cat <<EOF | redis-cli -h ${REDIS_HOST} -p ${REDIS_PORT} -n 5
|
||||
HMSET api_keys:cartodb250user:default_public \
|
||||
user "cartodb250user" \
|
||||
type "default" \
|
||||
grants_sql "true" \
|
||||
database_role "testpublicuser" \
|
||||
database_password "public"
|
||||
EOF
|
||||
|
||||
# API Key Master
|
||||
cat <<EOF | redis-cli -h ${REDIS_HOST} -p ${REDIS_PORT} -n 5
|
||||
HMSET api_keys:cartodb250user:1234 \
|
||||
user "cartodb250user" \
|
||||
type "master" \
|
||||
grants_sql "true" \
|
||||
database_role "${TESTUSER}" \
|
||||
database_password "${TESTPASS}"
|
||||
EOF
|
||||
|
||||
fi
|
||||
|
||||
echo "ok, you can run test now"
|
||||
@ -1,151 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
# To make output dates deterministic
|
||||
export TZ='Europe/Rome'
|
||||
export PGAPPNAME='cartodb_sqlapi_tester'
|
||||
|
||||
# In case PGUSER env variable does not exist we attempt to use `postgres`
|
||||
if test x"${PGUSER}" = x; then
|
||||
echo "PGUSER not found"
|
||||
PGUSER=postgres
|
||||
else
|
||||
echo "PGUSER found = ${PGUSER}"
|
||||
fi
|
||||
|
||||
OPT_CREATE_PGSQL=yes # create/prepare the postgresql test database
|
||||
OPT_CREATE_REDIS=yes # create/prepare the redis test databases
|
||||
OPT_DROP_PGSQL=yes # drop the postgreql test environment
|
||||
OPT_DROP_REDIS=yes # drop the redis test environment
|
||||
OPT_COVERAGE=no # run tests with coverage
|
||||
|
||||
cd $(dirname $0)
|
||||
BASEDIR=$(pwd)
|
||||
cd -
|
||||
|
||||
REDIS_PORT=`node -e "console.log(require('${BASEDIR}/../config/environments/test.js').redis_port)"`
|
||||
export REDIS_PORT
|
||||
echo "REDIS_PORT: [${REDIS_PORT}]"
|
||||
|
||||
cleanup() {
|
||||
if test x"$OPT_DROP" = xyes; then
|
||||
if test x"$PID_REDIS" = x; then
|
||||
PID_REDIS=$(cat ${BASEDIR}/redis.pid)
|
||||
if test x"$PID_REDIS" = x; then
|
||||
echo "Could not find a test redis pid to kill it"
|
||||
return;
|
||||
fi
|
||||
fi
|
||||
echo "Cleaning up"
|
||||
kill ${PID_REDIS}
|
||||
fi
|
||||
}
|
||||
|
||||
cleanup_and_exit() {
|
||||
cleanup
|
||||
exit
|
||||
}
|
||||
|
||||
die() {
|
||||
msg=$1
|
||||
echo "${msg}" >&2
|
||||
cleanup
|
||||
exit 1
|
||||
}
|
||||
|
||||
trap 'cleanup_and_exit' 1 2 3 5 9 13
|
||||
|
||||
while [ -n "$1" ]; do
|
||||
if test "$1" = "--nodrop"; then
|
||||
OPT_DROP_REDIS=no
|
||||
OPT_DROP_PGSQL=no
|
||||
shift
|
||||
continue
|
||||
elif test "$1" = "--nodrop-pg"; then
|
||||
OPT_DROP_PGSQL=no
|
||||
shift
|
||||
continue
|
||||
elif test "$1" = "--nodrop-redis"; then
|
||||
OPT_DROP_REDIS=no
|
||||
shift
|
||||
continue
|
||||
elif test "$1" = "--nocreate"; then
|
||||
OPT_CREATE_REDIS=no
|
||||
OPT_CREATE_PGSQL=no
|
||||
shift
|
||||
continue
|
||||
elif test "$1" = "--nocreate-pg"; then
|
||||
OPT_CREATE_PGSQL=no
|
||||
shift
|
||||
continue
|
||||
elif test "$1" = "--nocreate-redis"; then
|
||||
OPT_CREATE_REDIS=no
|
||||
shift
|
||||
continue
|
||||
elif test "$1" = "--with-coverage"; then
|
||||
OPT_COVERAGE=yes
|
||||
shift
|
||||
continue
|
||||
else
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
if [ -z "$1" ]; then
|
||||
echo "Usage: $0 [<options>] <test> [<test>]" >&2
|
||||
echo "Options:" >&2
|
||||
echo " --nocreate do not create the test environment on start" >&2
|
||||
echo " --nocreate-pg do not create the pgsql test environment" >&2
|
||||
echo " --nocreate-redis do not create the redis test environment" >&2
|
||||
echo " --nodrop do not drop the test environment on exit" >&2
|
||||
echo " --nodrop-pg do not drop the pgsql test environment" >&2
|
||||
echo " --nodrop-redis do not drop the redis test environment" >&2
|
||||
echo " --with-coverage use istanbul to determine code coverage" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
TESTS=$@
|
||||
|
||||
if test x"$OPT_CREATE_REDIS" = xyes; then
|
||||
echo "Starting redis on port ${REDIS_PORT}"
|
||||
REDIS_CELL_PATH="${BASEDIR}/support/libredis_cell.so"
|
||||
if [[ "$OSTYPE" == "darwin"* ]]; then
|
||||
REDIS_CELL_PATH="${BASEDIR}/support/libredis_cell.dylib"
|
||||
fi
|
||||
echo "port ${REDIS_PORT}" | redis-server - --loadmodule ${REDIS_CELL_PATH} > ${BASEDIR}/test.log &
|
||||
PID_REDIS=$!
|
||||
echo ${PID_REDIS} > ${BASEDIR}/redis.pid
|
||||
fi
|
||||
|
||||
PREPARE_DB_OPTS=
|
||||
if test x"$OPT_CREATE_PGSQL" != xyes; then
|
||||
PREPARE_DB_OPTS="$PREPARE_DB_OPTS --skip-pg"
|
||||
fi
|
||||
if test x"$OPT_CREATE_REDIS" != xyes; then
|
||||
PREPARE_DB_OPTS="$PREPARE_DB_OPTS --skip-redis"
|
||||
fi
|
||||
|
||||
echo "Preparing the environment"
|
||||
cd ${BASEDIR}
|
||||
sh prepare_db.sh ${PREPARE_DB_OPTS} || die "database preparation failure"
|
||||
cd -
|
||||
|
||||
PATH=node_modules/.bin/:node_modules/mocha/bin:$PATH
|
||||
|
||||
echo
|
||||
echo "Environment:"
|
||||
echo
|
||||
echo " ogr2ogr version: "`ogr2ogr --version`
|
||||
echo
|
||||
|
||||
if test x"$OPT_COVERAGE" = xyes; then
|
||||
echo "Running tests with coverage"
|
||||
./node_modules/.bin/istanbul cover node_modules/.bin/_mocha -- -u tdd --trace -t 5000 --exit ${TESTS}
|
||||
else
|
||||
echo "Running tests"
|
||||
mocha -u tdd -t 5000 --exit ${TESTS}
|
||||
fi
|
||||
ret=$?
|
||||
|
||||
cleanup || exit 1
|
||||
|
||||
exit $ret
|
||||
@ -1,24 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
/etc/init.d/postgresql start
|
||||
|
||||
source /src/nodejs-install.sh
|
||||
|
||||
# Configure
|
||||
./configure
|
||||
|
||||
# Install cartodb-postgresql extension
|
||||
git clone https://github.com/CartoDB/cartodb-postgresql.git
|
||||
cd cartodb-postgresql && make && make install && cd ..
|
||||
|
||||
echo "Node.js version: "
|
||||
node -v
|
||||
|
||||
echo "npm version:"
|
||||
npm -v
|
||||
|
||||
# install dependencies
|
||||
npm ci
|
||||
npm ls
|
||||
|
||||
npm test
|
||||
Loading…
Reference in New Issue
Block a user