这是indexloc提供的服务，不要输入任何密码
Skip to content

fix hpc combine error (close #2946) #2947

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 2, 2019
Merged

fix hpc combine error (close #2946) #2947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
36f6161
Fix hpc combine error
nizar-m Sep 26, 2019
db46cb0
Do not perform ciignore
nizar-m Sep 26, 2019
02affd0
xfail test jsonb_has_all
nizar-m Sep 26, 2019
9914719
Bring back ciignore
nizar-m Sep 27, 2019
ae74e90
Refer jsonb_has_all xfaul to the corresponding issue in graphql-engin…
nizar-m Sep 30, 2019
d3d46f0
Merge branch 'master' into issue-2946
nizar-m Oct 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,9 @@ refs:
- run:
name: Run Python tests
environment:
# hpc report seems to fail with the default -N
GHCRTS: -N1
# Setting default number of threads to 2
# since circleci allocates 2 cpus per test container
GHCRTS: -N2
HASURA_GRAPHQL_DATABASE_URL: 'postgres://gql_test:@localhost:5432/gql_test'
HASURA_GRAPHQL_DATABASE_URL_2: 'postgres://gql_test:@localhost:5432/gql_test2'
GRAPHQL_ENGINE: '/build/_server_output/graphql-engine'
Expand Down
5 changes: 5 additions & 0 deletions .circleci/test-server.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,12 @@ combine_all_hpc_reports() {
continue
fi
if [ -f "$combined_file" ] ; then
GHCRTS_PREV="$GHCRTS"
# Unsetting GHCRTS as hpc combine fails if GCHRTS=-N2 is present
unset GHCRTS
(set -x && stack --allow-different-user exec -- hpc combine "$combined_file" "$tix_file" --union --output="$combined_file_intermediate" && set +x && mv "$combined_file_intermediate" "$combined_file" && rm "$tix_file" ) || true
# Restoring GHCRTS
export GHCRTS="$GHCRTS_PREV"
else
mv "$tix_file" "$combined_file" || true
fi
Expand Down
1 change: 1 addition & 0 deletions server/tests-py/test_graphql_queries.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,7 @@ def test_staff_passed_students(self, hge_ctx, transport):
def test_user_query_auction(self, hge_ctx, transport):
check_query_f(hge_ctx, self.dir() + '/user_query_auction.yaml', transport)

@pytest.mark.xfail(reason="Refer https://github.com/hasura/graphql-engine-internal/issues/252")
def test_jsonb_has_all(self, hge_ctx, transport):
check_query_f(hge_ctx, self.dir() + '/jsonb_has_all.yaml', transport)

Expand Down