Merge branch 'master' into fix-simple-tab-content

apache · Jan 1, 2022 · e8dd3d9 · e8dd3d9
2 parents 9100ee6 + 4954d52
commit e8dd3d9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/superset-python-presto-hive.yml b/.github/workflows/superset-python-presto-hive.yml
@@ -80,7 +80,7 @@ jobs:
       - name: Python unit tests (PostgreSQL)
         if: steps.check.outcome == 'failure'
         run: |
-          ./scripts/python_tests.sh
+          ./scripts/python_tests.sh -m 'chart_data_flow or sql_json_flow'
       - name: Upload code coverage
         if: steps.check.outcome == 'failure'
         run: |
@@ -158,7 +158,7 @@ jobs:
       - name: Python unit tests (PostgreSQL)
         if: steps.check.outcome == 'failure'
         run: |
-          ./scripts/python_tests.sh
+          ./scripts/python_tests.sh -m 'chart_data_flow or sql_json_flow'
       - name: Upload code coverage
         if: steps.check.outcome == 'failure'
         run: |

diff --git a/scripts/python_tests.sh b/scripts/python_tests.sh
@@ -31,4 +31,5 @@ superset db upgrade
 superset init
 
 echo "Running tests"
-pytest --durations=0 --maxfail=1 --cov=superset $@
+
+pytest --durations=0 --maxfail=1 --cov=superset "$@"
diff --git a/tests/integration_tests/sqllab_tests.py b/tests/integration_tests/sqllab_tests.py
@@ -66,6 +66,7 @@
 QUERY_3 = "SELECT * FROM birth_names LIMIT 10"
 
 
+@pytest.mark.sql_json_flow
 class TestSqlLab(SupersetTestCase):
     """Testings for Sql Lab"""