From ffa3f5e3cc7190b4957518ebeaa19d849d216449 Mon Sep 17 00:00:00 2001 From: Samir Talwar Date: Thu, 20 Apr 2023 11:26:38 +0200 Subject: [PATCH] server/tests-py: Remove test_horizontal_scale.py. This removes *test_horizontal_scale.py*, which tests horizontal scaling by running some tests against two HGE servers, both talking to PgBouncer. This doesn't really test HGE; it's testing whether PgBouncer guarantees the same level of consistency as PostgreSQL. I'm not convinced that it's worthwhile, so I am deleting it. [NDAT-542]: https://hasurahq.atlassian.net/browse/NDAT-542?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ PR-URL: https://github.com/hasura/graphql-engine-mono/pull/8821 GitOrigin-RevId: 2029f2fea11c7fd58ed47e724cb3cd50e67d5a43 --- .circleci/server-test-names.txt | 2 +- server/tests-py/test_horizontal_scale.py | 63 ------------------------ 2 files changed, 1 insertion(+), 64 deletions(-) delete mode 100644 server/tests-py/test_horizontal_scale.py diff --git a/.circleci/server-test-names.txt b/.circleci/server-test-names.txt index 63aa9056bb0..2aea898c8ef 100644 --- a/.circleci/server-test-names.txt +++ b/.circleci/server-test-names.txt @@ -54,5 +54,5 @@ # apollo-federation # allowlist-queries # jwk-url -horizontal-scaling +# horizontal-scaling # developer-api-tests diff --git a/server/tests-py/test_horizontal_scale.py b/server/tests-py/test_horizontal_scale.py deleted file mode 100644 index afcf90d60fc..00000000000 --- a/server/tests-py/test_horizontal_scale.py +++ /dev/null @@ -1,63 +0,0 @@ -import pytest -import time -import json -import jsondiff -from context import PytestConf -from ruamel.yaml import YAML - -yaml=YAML(typ='safe', pure=True) - - -if not PytestConf.config.getoption("--test-hge-scale-url"): - pytest.skip("--test-hge-scale-url flag is missing, skipping tests", allow_module_level=True) - - -class TestHorizontalScaleBasic(): - servers = {} - - @pytest.fixture(autouse=True, scope='class') - def transact(self, hge_ctx): - self.servers['1'] = hge_ctx.hge_url - self.servers['2'] = hge_ctx.hge_scale_url - yield - # teardown - hge_ctx.v1q_f(self.dir() + '/teardown.yaml') - - def test_horizontal_scale_basic(self, hge_ctx): - with open(self.dir() + "/steps.yaml") as c: - conf = yaml.load(c) - - assert isinstance(conf, list) == True, 'Not a list' - for _, step in enumerate(conf): - # execute operation - response = hge_ctx.http.post( - self.servers[step['operation']['server']] + "/v1/query", - json=step['operation']['query'] - ) - resp = response.json() - assert \ - response.status_code == 200, \ - f'Expected {response.status_code} to be 200. Response:\n{json.dumps(resp, indent=2)}' - - # wait for 20 sec - time.sleep(20) - # validate data - response = hge_ctx.http.post( - self.servers[step['validate']['server']] + "/v1alpha1/graphql", - json=step['validate']['query'] - ) - resp = response.json() - assert \ - response.status_code == 200, \ - f'Expected {response.status_code} to be 200. Response:\n{json.dumps(resp, indent=2)}' - - if 'response' in step['validate']: - assert resp == step['validate']['response'], yaml.dump({ - 'response': resp, - 'expected': step['validate']['response'], - 'diff': jsondiff.diff(step['validate']['response'], resp) - }) - - @classmethod - def dir(cls): - return 'queries/horizontal_scale/basic'