Skip to content

Commit

Permalink
fix e2e tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@diPhantxm
diPhantxm committed Aug 29, 2023
1 parent 2a28e8c commit f80ad60
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 13 deletions.
18 changes: 12 additions & 6 deletions docker/tests/bin/move.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,23 @@ sleep 20

set -ex

psql "host=spqr_coordinator sslmode=disable user=user1 dbname=db1 port=7002" -c 'ADD SHARDING RULE r1 COLUMNS w_id;' || {
coordinator="spqr_router_1_1"
psql "host=spqr_router_1_1 sslmode=disable user=user1 dbname=db1 port=7002" -c "SHOW ROUTERS;" || {
coordinator="spqr_router_1_2"
}
echo "coordinator host: ${coordinator}"

psql "host=${coordinator} sslmode=disable user=user1 dbname=db1 port=7002" -c 'ADD SHARDING RULE r1 COLUMNS w_id;' || {
echo "ERROR: tests failed"
exit 1
}

psql "host=spqr_coordinator sslmode=disable user=user1 dbname=db1 port=7002" -c 'ADD KEY RANGE krid1 FROM 1 TO 10 ROUTE TO sh1;' || {
psql "host=${coordinator} sslmode=disable user=user1 dbname=db1 port=7002" -c 'ADD KEY RANGE krid1 FROM 1 TO 10 ROUTE TO sh1;' || {
echo "ERROR: tests failed"
exit 1
}

psql "host=spqr_coordinator sslmode=disable user=user1 dbname=db1 port=7002" -c 'ADD KEY RANGE krid2 FROM 11 TO 20 ROUTE TO sh2;' || {
psql "host=${coordinator} sslmode=disable user=user1 dbname=db1 port=7002" -c 'ADD KEY RANGE krid2 FROM 11 TO 20 ROUTE TO sh2;' || {
echo "ERROR: tests failed"
exit 1
}
Expand All @@ -39,7 +45,7 @@ psql "host=spqr_router_1_1 sslmode=disable user=user1 dbname=db1 port=6432" -c "
exit 1
}

psql "host=spqr_coordinator sslmode=disable user=user1 dbname=db1 port=7002" -c "MOVE KEY RANGE krid2 to sh1;" || {
psql "host=${coordinator} sslmode=disable user=user1 dbname=db1 port=7002" -c "MOVE KEY RANGE krid2 to sh1;" || {
echo "ERROR: tests failed"
exit 1
}
Expand All @@ -61,11 +67,11 @@ psql "host=spqr_router_1_1 sslmode=disable user=user1 dbname=db1 port=6432" -c "
exit 1
}

psql "host=spqr_coordinator sslmode=disable user=user1 dbname=db1 port=7002" -c "DROP KEY RANGE ALL;" || {
psql "host=${coordinator} sslmode=disable user=user1 dbname=db1 port=7002" -c "DROP KEY RANGE ALL;" || {
echo "ERROR: tests failed"
exit 1
}
psql "host=spqr_coordinator sslmode=disable user=user1 dbname=db1 port=7002" -c 'DROP SHARDING RULE ALL;' || {
psql "host=${coordinator} sslmode=disable user=user1 dbname=db1 port=7002" -c 'DROP SHARDING RULE ALL;' || {
echo "ERROR: tests failed"
exit 1
}
Expand Down
20 changes: 13 additions & 7 deletions docker/tests/bin/with_coordinator.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,18 @@ sleep 20

set -ex

coordinator="spqr_router_1_1"
psql "host=spqr_router_1_1 sslmode=disable user=user1 dbname=db1 port=7002" -c "SHOW ROUTERS;" || {
coordinator="spqr_router_1_2"
}
echo "coordinator host: ${coordinator}"

psql "host=spqr_router_1_1 port=7432 sslmode=disable user=user1 dbname=db1" -c "SHOW key_ranges;"|| {
echo "ERROR: tests failed"
exit 1
}

psql "host=spqr_coordinator sslmode=disable port=7002" -c "REGISTER ROUTER r1 ADDRESS spqr_router_1_1:7000;" || {
psql "host=${coordinator} sslmode=disable port=7002" -c "REGISTER ROUTER r1 ADDRESS spqr_router_1_1:7000;" || {
echo "ERROR: tests failed"
exit 1
}
Expand All @@ -21,28 +27,28 @@ psql "host=spqr_router_1_1 port=7432 sslmode=disable user=user1 dbname=db1" -c "

# configure ectd

psql "host=spqr_coordinator sslmode=disable user=user1 dbname=db1 port=7002" -c 'DROP KEY RANGE ALL;' || {
psql "host=${coordinator} sslmode=disable user=user1 dbname=db1 port=7002" -c 'DROP KEY RANGE ALL;' || {
echo "ERROR: tests failed"
exit 1
}

psql "host=spqr_coordinator sslmode=disable user=user1 dbname=db1 port=7002" -c 'DROP SHARDING RULE ALL;' || {
psql "host=${coordinator} sslmode=disable user=user1 dbname=db1 port=7002" -c 'DROP SHARDING RULE ALL;' || {
echo "ERROR: tests failed"
exit 1
}


psql "host=spqr_coordinator sslmode=disable user=user1 dbname=db1 port=7002" -c 'ADD KEY RANGE krid1 FROM 1 TO 10 ROUTE TO sh1;' || {
psql "host=${coordinator} sslmode=disable user=user1 dbname=db1 port=7002" -c 'ADD KEY RANGE krid1 FROM 1 TO 10 ROUTE TO sh1;' || {
echo "ERROR: tests failed"
exit 1
}

psql "host=spqr_coordinator sslmode=disable user=user1 dbname=db1 port=7002" -c 'ADD KEY RANGE krid2 FROM 11 TO 20 ROUTE TO sh1;' || {
psql "host=${coordinator} sslmode=disable user=user1 dbname=db1 port=7002" -c 'ADD KEY RANGE krid2 FROM 11 TO 20 ROUTE TO sh1;' || {
echo "ERROR: tests failed"
exit 1
}

psql "host=spqr_coordinator sslmode=disable user=user1 dbname=db1 port=7002" -c 'ADD SHARDING RULE rule1 COLUMNS id;' || {
psql "host=${coordinator} sslmode=disable user=user1 dbname=db1 port=7002" -c 'ADD SHARDING RULE rule1 COLUMNS id;' || {
echo "ERROR: tests failed"
exit 1
}
Expand All @@ -57,7 +63,7 @@ psql "host=spqr_router_1_1 port=7432 sslmode=disable user=user1 dbname=db1" -c "
exit 1
}

psql "host=spqr_coordinator sslmode=disable user=user1 dbname=db1 port=7002" -c 'DROP SHARDING RULE rule1;' || {
psql "host=${coordinator} sslmode=disable user=user1 dbname=db1 port=7002" -c 'DROP SHARDING RULE rule1;' || {
echo "ERROR: tests failed"
exit 1
}
Expand Down

0 comments on commit f80ad60

Please sign in to comment.