(tsfile) branch code_coverage_v3 updated: finish

[haonan]

This is an automated email from the ASF dual-hosted git repository.

haonan pushed a commit to branch code_coverage_v3
in repository https://gitbox.apache.org/repos/asf/tsfile.git


The following commit(s) were added to refs/heads/code_coverage_v3 by this push:
     new 60f3a544 finish
60f3a544 is described below

commit 60f3a5440274e248c92e05b3e1342cd4a0667d8b
Author: HTHou <hhao...@outlook.com>
AuthorDate: Fri Aug 2 00:34:05 2024 +0800

    finish
---
 .github/workflows/code-coverage.yml         |  3 +--
 .github/workflows/unit-test.yml             |  3 +--
 code-coverage/copy-code-coverage-sources.sh | 20 ++++++++++----------
 python/test.py                              |  6 +++---
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/code-coverage.yml 
b/.github/workflows/code-coverage.yml
index ec4813cd..3240ee0d 100644
--- a/.github/workflows/code-coverage.yml
+++ b/.github/workflows/code-coverage.yml
@@ -3,7 +3,6 @@ on:
   push:
     branches:
       - develop
-      - code_coverage_v3
     paths-ignore:
       - 'docs/**'
   pull_request:
@@ -28,7 +27,7 @@ jobs:
       - name: Generate code coverage reports
         run: |
           sudo apt-get install lcov
-          ./mvnw -B -P with-cpp,with-python,with-code-coverage clean verify
+          ./mvnw -B -P with-java,with-cpp,with-python,with-code-coverage clean 
verify
           lcov --capture --directory cpp/target/build/test --output-file 
cpp/target/build/test/coverage.info
           lcov --remove cpp/target/build/test/coverage.info 
'*/tsfile/cpp/test/*' --output-file cpp/target/build/test/coverage_filtered.info
           genhtml cpp/target/build/test/coverage_filtered.info 
--output-directory cpp/target/build/test/coverage_report
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
index ea7e0cd3..93e95a80 100644
--- a/.github/workflows/unit-test.yml
+++ b/.github/workflows/unit-test.yml
@@ -8,7 +8,6 @@ on:
     branches:
       - develop
       - iotdb
-      - code_coverage_v3
     paths-ignore:
       - 'docs/**'
   pull_request:
@@ -82,4 +81,4 @@ jobs:
       - name: Build and test with Maven
         shell: bash
         run: |
-          ./mvnw${{ steps.platform_suffix.outputs.platform_suffix }} -P 
with-cpp,with-python clean verify
+          ./mvnw${{ steps.platform_suffix.outputs.platform_suffix }} -P 
with-java,with-cpp,with-python clean verify
diff --git a/code-coverage/copy-code-coverage-sources.sh 
b/code-coverage/copy-code-coverage-sources.sh
index 7c6361fe..19c24fd1 100755
--- a/code-coverage/copy-code-coverage-sources.sh
+++ b/code-coverage/copy-code-coverage-sources.sh
@@ -18,14 +18,14 @@
 # under the License.
 #
 
-#for file in ../java/*/target/*.exec
-#do
-#   cp $file ./target/
-#done
-#
-#for file in ../java/*/target/classes
-#do
-#   echo "copy from" ${file}
-#   cp -r $file ./target/
-#done
+for file in ../java/*/target/*.exec
+do
+   cp $file ./target/
+done
+
+for file in ../java/*/target/classes
+do
+   echo "copy from" ${file}
+   cp -r $file ./target/
+done
 
diff --git a/python/test.py b/python/test.py
index a2d41bd2..29fb6c24 100644
--- a/python/test.py
+++ b/python/test.py
@@ -73,9 +73,9 @@ def test_write_tsfile():
 
 # test reading data
 def test_read_tsfile():
-    # # skip test on windows because of the bug in the tsfile library
-    # if platform.system() == "Windows":
-    #     return
+    # skip test on windows because of the bug in the tsfile library
+    if platform.system() == "Windows":
+        return
     # test read a non-existent file
     with ut.TestCase().assertRaises(FileNotFoundError):
         ts.read_tsfile(DATA_PATH + "/notexist.tsfile", TABLE_NAME, ["level", 
"num"])