Intermediate changes

commit_hash:502734a9dee23093e1fb1015bd57ef03f415cf71

5 files changed, 56 insertions, 16 deletions

diff --git a/yql/essentials/core/type_ann/type-ann-coverage.sh b/yql/essentials/core/type_ann/type-ann-coverage.sh
index 35cf18ce3b..e2ef72a7d0 100755
--- a/yql/essentials/core/type_ann/type-ann-coverage.sh
+++ b/yql/essentials/core/type_ann/type-ann-coverage.sh
@@ -22,12 +22,14 @@ UNCOVERED_FILE=${1:-$(mktemp --tmpdir yql-essentials-core-type_ann-uncovered-XXX
 # * --coverage-report --output $REPORT_ROOT -- build the HTML
 #                       report for the collected code coverage;
 # See more info here: https://docs.yandex-team.ru/devtools/test/coverage.
-ya make -tA -C ${ARC_ROOT}/yql/essentials/tests/sql/minirun/ \
-    --build profile                                          \
-    --clang-coverage                                         \
-    --coverage-prefix-filter yql/essentials/core/type_ann    \
-    --coverage-report                                        \
-    --output $REPORT_ROOT                                    \
+ya make -tA                                                    \
+    -C ${ARC_ROOT}/yql/essentials/tests/sql/minirun            \
+    -C ${ARC_ROOT}/yql/essentials/tests/s-expressions/minirun  \
+    --build profile                                            \
+    --clang-coverage                                           \
+    --coverage-prefix-filter yql/essentials/core/type_ann      \
+    --coverage-report                                          \
+    --output $REPORT_ROOT                                      \
     --test-disable-timeout
 
 # Find an anchor to uncovered line in HTML report, ...
diff --git a/yql/essentials/tests/s-expressions/minirun/part1/canondata/result.json b/yql/essentials/tests/s-expressions/minirun/part1/canondata/result.json
index f1b81dcdc3..035cfe5ecb 100644
--- a/yql/essentials/tests/s-expressions/minirun/part1/canondata/result.json
+++ b/yql/essentials/tests/s-expressions/minirun/part1/canondata/result.json
@@ -601,6 +601,28 @@
             "uri": "https://{canondata_backend}/1937424/3fa0838c58e0529381593f7f5e7f1aa2df931e99/resource.tar.gz#test.test_Optimizers-Visit1-default.txt-Results_/results.txt"
         }
     ],
+    "test.test[Pure-LeftCons-default.txt-Debug]": [
+        {
+            "checksum": "ac7e155438800823a3a5de9f2b6da528",
+            "size": 19,
+            "uri": "https://{canondata_backend}/1937001/308c76dc2fef2983ba84ec1b64289d15ecbcb571/resource.tar.gz#test.test_Pure-LeftCons-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Pure-LeftCons-default.txt-Results]": [],
+    "test.test[Pure-RightCons-default.txt-Debug]": [
+        {
+            "checksum": "8b264058851ac233a659a3be873c4f04",
+            "size": 124,
+            "uri": "https://{canondata_backend}/1775319/b8ecc7a608f5a504a0c75105ed0e16620e86e244/resource.tar.gz#test.test_Pure-RightCons-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Pure-RightCons-default.txt-Results]": [
+        {
+            "checksum": "1dd9e200d993a98f38aa564e1f5a813f",
+            "size": 209,
+            "uri": "https://{canondata_backend}/1775319/b8ecc7a608f5a504a0c75105ed0e16620e86e244/resource.tar.gz#test.test_Pure-RightCons-default.txt-Results_/results.txt"
+        }
+    ],
     "test.test[Result-Resource-default.txt-Debug]": [
         {
             "checksum": "1879e2fd09f62180fc43c9b463356e2c",
diff --git a/yql/essentials/tests/s-expressions/minirun/pure.py b/yql/essentials/tests/s-expressions/minirun/pure.py
index 383094ebfe..38318d9fb8 100644
--- a/yql/essentials/tests/s-expressions/minirun/pure.py
+++ b/yql/essentials/tests/s-expressions/minirun/pure.py
@@ -41,7 +41,6 @@ def run_test(suite, case, cfg, tmpdir, what, yql_http_file_server):
                                  extra_args=extra_final_args, allow_llvm=False, data_path=DATA_PATH, run_sql=False)
 
     to_canonize = []
-    assert xfail or os.path.exists(res.results_file)
     assert not tables_res
 
     if what == 'Results':
@@ -51,8 +50,9 @@ def run_test(suite, case, cfg, tmpdir, what, yql_http_file_server):
         if do_custom_query_check(res, sql_query):
             return None
 
-        stable_result_file(res)
-        to_canonize.append(yatest.common.canonical_file(res.results_file))
+        if os.path.exists(res.results_file):
+            stable_result_file(res)
+            to_canonize.append(yatest.common.canonical_file(res.results_file))
         if res.std_err:
             to_canonize.append(normalize_source_code_path(res.std_err))
 
@@ -85,16 +85,17 @@ def run_test(suite, case, cfg, tmpdir, what, yql_http_file_server):
             verbose=True,
             parameters=parameters)
 
-        assert os.path.exists(opt_res.results_file)
+        assert os.path.exists(opt_res.results_file) == os.path.exists(res.results_file)
         assert not opt_tables_res
 
-        base_res_yson = normalize_result(stable_result_file(res), False)
-        opt_res_yson = normalize_result(stable_result_file(opt_res), False)
+        if os.path.exists(res.results_file):
+            base_res_yson = normalize_result(stable_result_file(res), False)
+            opt_res_yson = normalize_result(stable_result_file(opt_res), False)
 
-        # Compare results
-        assert opt_res_yson == base_res_yson, 'RESULTS_DIFFER\n' \
-            'Result:\n %(opt_res_yson)s\n\n' \
-            'Base result:\n %(base_res_yson)s\n' % locals()
+            # Compare results
+            assert opt_res_yson == base_res_yson, 'RESULTS_DIFFER\n' \
+                'Result:\n %(opt_res_yson)s\n\n' \
+                'Base result:\n %(base_res_yson)s\n' % locals()
 
         return None
 
diff --git a/yql/essentials/tests/s-expressions/suites/Pure/LeftCons.yqls b/yql/essentials/tests/s-expressions/suites/Pure/LeftCons.yqls
new file mode 100644
index 0000000000..3b61bfe384
--- /dev/null
+++ b/yql/essentials/tests/s-expressions/suites/Pure/LeftCons.yqls
@@ -0,0 +1,5 @@
+(
+(let c (Cons! world (String 'a)))
+(let world (Left! c))
+(return world)
+)
diff --git a/yql/essentials/tests/s-expressions/suites/Pure/RightCons.yqls b/yql/essentials/tests/s-expressions/suites/Pure/RightCons.yqls
new file mode 100644
index 0000000000..ec8e6d51da
--- /dev/null
+++ b/yql/essentials/tests/s-expressions/suites/Pure/RightCons.yqls
@@ -0,0 +1,10 @@
+(
+#comment
+(let config (DataSource 'config))
+(let res_sink (DataSink 'result))
+(let c (Cons! world (String 'a)))
+(let data (Right! c))
+(let world (Write! world res_sink (Key) data '('('type))))
+(let world (Commit! world res_sink))
+(return world)
+)