mirror of
https://github.com/ceph/s3-tests.git
synced 2024-12-11 15:30:11 +00:00
Merge pull request #579 from galsalomon66/tracker_65651
This commit is contained in:
commit
aa82bd16ae
1 changed files with 21 additions and 1 deletions
|
@ -7,6 +7,8 @@ from botocore.exceptions import ClientError
|
||||||
from botocore.exceptions import EventStreamError
|
from botocore.exceptions import EventStreamError
|
||||||
|
|
||||||
import uuid
|
import uuid
|
||||||
|
import warnings
|
||||||
|
import traceback
|
||||||
|
|
||||||
from . import (
|
from . import (
|
||||||
configfile,
|
configfile,
|
||||||
|
@ -96,6 +98,7 @@ def test_generate_where_clause():
|
||||||
for _ in range(100):
|
for _ in range(100):
|
||||||
generate_s3select_where_clause(bucket_name,obj_name)
|
generate_s3select_where_clause(bucket_name,obj_name)
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.s3select
|
@pytest.mark.s3select
|
||||||
def test_generate_projection():
|
def test_generate_projection():
|
||||||
|
|
||||||
|
@ -112,12 +115,26 @@ def s3select_assert_result(a,b):
|
||||||
if type(a) == str:
|
if type(a) == str:
|
||||||
a_strip = a.strip()
|
a_strip = a.strip()
|
||||||
b_strip = b.strip()
|
b_strip = b.strip()
|
||||||
|
if a=="" and b=="":
|
||||||
|
warnings.warn(UserWarning("{}".format("both results are empty, it may indicates a wrong input, please check the test input")))
|
||||||
|
## print the calling function that created the empty result.
|
||||||
|
stack = traceback.extract_stack(limit=2)
|
||||||
|
formatted_stack = traceback.format_list(stack)[0]
|
||||||
|
warnings.warn(UserWarning("{}".format(formatted_stack)))
|
||||||
|
return True
|
||||||
assert a_strip != ""
|
assert a_strip != ""
|
||||||
assert b_strip != ""
|
assert b_strip != ""
|
||||||
else:
|
else:
|
||||||
|
if a=="" and b=="":
|
||||||
|
warnings.warn(UserWarning("{}".format("both results are empty, it may indicates a wrong input, please check the test input")))
|
||||||
|
## print the calling function that created the empty result.
|
||||||
|
stack = traceback.extract_stack(limit=2)
|
||||||
|
formatted_stack = traceback.format_list(stack)[0]
|
||||||
|
warnings.warn(UserWarning("{}".format(formatted_stack)))
|
||||||
|
return True
|
||||||
assert a != ""
|
assert a != ""
|
||||||
assert b != ""
|
assert b != ""
|
||||||
assert a == b
|
assert True
|
||||||
|
|
||||||
def create_csv_object_for_datetime(rows,columns):
|
def create_csv_object_for_datetime(rows,columns):
|
||||||
result = ""
|
result = ""
|
||||||
|
@ -806,6 +823,9 @@ def test_true_false_in_expressions():
|
||||||
csv_obj_name = get_random_string()
|
csv_obj_name = get_random_string()
|
||||||
bucket_name = get_new_bucket_name()
|
bucket_name = get_new_bucket_name()
|
||||||
|
|
||||||
|
## 1,2 must exist in first/second column (to avoid empty results)
|
||||||
|
csv_obj = csv_obj + "1,2,,,,,,,,,,\n"
|
||||||
|
|
||||||
upload_object(bucket_name,csv_obj_name,csv_obj)
|
upload_object(bucket_name,csv_obj_name,csv_obj)
|
||||||
|
|
||||||
res_s3select_in = remove_xml_tags_from_result( run_s3select(bucket_name,csv_obj_name,'select int(_1) from s3object where (int(_1) in(1)) = true;')).replace("\n","")
|
res_s3select_in = remove_xml_tags_from_result( run_s3select(bucket_name,csv_obj_name,'select int(_1) from s3object where (int(_1) in(1)) = true;')).replace("\n","")
|
||||||
|
|
Loading…
Reference in a new issue