From 36a9976e9d8d8ea253fb8aab468ae6718dabf7da Mon Sep 17 00:00:00 2001 From: Aaron Son Date: Thu, 10 Jun 2021 16:48:46 -0700 Subject: [PATCH] .github: Run go/libraries/doltcore/sqle/altertests in separate job. Run them without -race. --- .github/workflows/ci-go-tests.yaml | 24 +++++++++++++++++++ .../doltcore/sqle/altertests/common_test.go | 7 ++++++ .../sqle/altertests/modify_bigint_test.go | 1 + .../altertests/modify_bigint_unsigned_test.go | 1 + .../sqle/altertests/modify_bit16_test.go | 1 + .../sqle/altertests/modify_bit1_test.go | 1 + .../sqle/altertests/modify_bit24_test.go | 1 + .../sqle/altertests/modify_bit32_test.go | 1 + .../sqle/altertests/modify_bit48_test.go | 1 + .../sqle/altertests/modify_bit64_test.go | 1 + .../sqle/altertests/modify_bit8_test.go | 1 + .../altertests/modify_decimal15_0_test.go | 1 + .../sqle/altertests/modify_decimal1_0_test.go | 1 + .../altertests/modify_decimal30_0_test.go | 1 + .../altertests/modify_decimal65_0_test.go | 1 + .../altertests/modify_decimal65_1_test.go | 1 + .../sqle/altertests/modify_double_test.go | 1 + .../sqle/altertests/modify_float_test.go | 1 + .../sqle/altertests/modify_int_test.go | 1 + .../altertests/modify_int_unsigned_test.go | 1 + .../sqle/altertests/modify_mediumint_test.go | 1 + .../modify_mediumint_unsigned_test.go | 1 + .../sqle/altertests/modify_smallint_test.go | 1 + .../modify_smallint_unsigned_test.go | 1 + .../sqle/altertests/modify_tinyint_test.go | 1 + .../modify_tinyint_unsigned_test.go | 1 + 26 files changed, 55 insertions(+) diff --git a/.github/workflows/ci-go-tests.yaml b/.github/workflows/ci-go-tests.yaml index f67449db58..e2d7a12d66 100644 --- a/.github/workflows/ci-go-tests.yaml +++ b/.github/workflows/ci-go-tests.yaml @@ -55,3 +55,27 @@ jobs: done env: MATRIX_OS: ${{ matrix.os }} + altertests: + name: Go tests sqle/altertests + defaults: + run: + shell: bash + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [macos-10.15, ubuntu-18.04, windows-latest] + steps: + - name: Set up Go 1.x + uses: actions/setup-go@v2 + with: + go-version: ^1.15 + id: go + - uses: actions/checkout@v2 + - name: Test All + working-directory: ./go + run: | + go test -timeout 30m -race ./libraries/doltcore/sqle/altertests + env: + MATRIX_OS: ${{ matrix.os }} + DOLT_TEST_RUN_ALTERTESTS: "true" diff --git a/go/libraries/doltcore/sqle/altertests/common_test.go b/go/libraries/doltcore/sqle/altertests/common_test.go index a420bbe551..74d79e70ef 100644 --- a/go/libraries/doltcore/sqle/altertests/common_test.go +++ b/go/libraries/doltcore/sqle/altertests/common_test.go @@ -20,6 +20,7 @@ import ( "io" "testing" "time" + "os" "github.com/dolthub/go-mysql-server/sql" "github.com/stretchr/testify/assert" @@ -67,6 +68,12 @@ func RunModifyTypeTests(t *testing.T, tests []ModifyTypeTest) { } } +func SkipByDefaultInCI(t *testing.T) { + if os.Getenv("CI") != "" && os.Getenv("DOLT_TEST_RUN_ALTERTESTS") == "" { + t.Skip() + } +} + func widenValue(v interface{}) interface{} { switch x := v.(type) { case int: diff --git a/go/libraries/doltcore/sqle/altertests/modify_bigint_test.go b/go/libraries/doltcore/sqle/altertests/modify_bigint_test.go index edeacbee76..08ac5e3942 100644 --- a/go/libraries/doltcore/sqle/altertests/modify_bigint_test.go +++ b/go/libraries/doltcore/sqle/altertests/modify_bigint_test.go @@ -19,6 +19,7 @@ import ( ) func TestModifyTypeBigint(t *testing.T) { + SkipByDefaultInCI(t) tests := []ModifyTypeTest{ { "BIGINT", diff --git a/go/libraries/doltcore/sqle/altertests/modify_bigint_unsigned_test.go b/go/libraries/doltcore/sqle/altertests/modify_bigint_unsigned_test.go index a9f878f869..3335b0a823 100644 --- a/go/libraries/doltcore/sqle/altertests/modify_bigint_unsigned_test.go +++ b/go/libraries/doltcore/sqle/altertests/modify_bigint_unsigned_test.go @@ -19,6 +19,7 @@ import ( ) func TestModifyTypeBigintUnsigned(t *testing.T) { + SkipByDefaultInCI(t) tests := []ModifyTypeTest{ { "BIGINT UNSIGNED", diff --git a/go/libraries/doltcore/sqle/altertests/modify_bit16_test.go b/go/libraries/doltcore/sqle/altertests/modify_bit16_test.go index 78de754629..e341904e6a 100644 --- a/go/libraries/doltcore/sqle/altertests/modify_bit16_test.go +++ b/go/libraries/doltcore/sqle/altertests/modify_bit16_test.go @@ -19,6 +19,7 @@ import ( ) func TestModifyTypeBit16(t *testing.T) { + SkipByDefaultInCI(t) tests := []ModifyTypeTest{ { "BIT(16)", diff --git a/go/libraries/doltcore/sqle/altertests/modify_bit1_test.go b/go/libraries/doltcore/sqle/altertests/modify_bit1_test.go index 93247fea64..25909b2ce5 100644 --- a/go/libraries/doltcore/sqle/altertests/modify_bit1_test.go +++ b/go/libraries/doltcore/sqle/altertests/modify_bit1_test.go @@ -19,6 +19,7 @@ import ( ) func TestModifyTypeBit1(t *testing.T) { + SkipByDefaultInCI(t) tests := []ModifyTypeTest{ { "BIT(1)", diff --git a/go/libraries/doltcore/sqle/altertests/modify_bit24_test.go b/go/libraries/doltcore/sqle/altertests/modify_bit24_test.go index 086d38cbe3..3baa1550ee 100644 --- a/go/libraries/doltcore/sqle/altertests/modify_bit24_test.go +++ b/go/libraries/doltcore/sqle/altertests/modify_bit24_test.go @@ -19,6 +19,7 @@ import ( ) func TestModifyTypeBit24(t *testing.T) { + SkipByDefaultInCI(t) tests := []ModifyTypeTest{ { "BIT(24)", diff --git a/go/libraries/doltcore/sqle/altertests/modify_bit32_test.go b/go/libraries/doltcore/sqle/altertests/modify_bit32_test.go index f9356a0b40..4f44ffb5c3 100644 --- a/go/libraries/doltcore/sqle/altertests/modify_bit32_test.go +++ b/go/libraries/doltcore/sqle/altertests/modify_bit32_test.go @@ -19,6 +19,7 @@ import ( ) func TestModifyTypeBit32(t *testing.T) { + SkipByDefaultInCI(t) tests := []ModifyTypeTest{ { "BIT(32)", diff --git a/go/libraries/doltcore/sqle/altertests/modify_bit48_test.go b/go/libraries/doltcore/sqle/altertests/modify_bit48_test.go index 0a3d295d91..246dc77b09 100644 --- a/go/libraries/doltcore/sqle/altertests/modify_bit48_test.go +++ b/go/libraries/doltcore/sqle/altertests/modify_bit48_test.go @@ -19,6 +19,7 @@ import ( ) func TestModifyTypeBit48(t *testing.T) { + SkipByDefaultInCI(t) tests := []ModifyTypeTest{ { "BIT(48)", diff --git a/go/libraries/doltcore/sqle/altertests/modify_bit64_test.go b/go/libraries/doltcore/sqle/altertests/modify_bit64_test.go index 927e965f76..956f83bca4 100644 --- a/go/libraries/doltcore/sqle/altertests/modify_bit64_test.go +++ b/go/libraries/doltcore/sqle/altertests/modify_bit64_test.go @@ -19,6 +19,7 @@ import ( ) func TestModifyTypeBit64(t *testing.T) { + SkipByDefaultInCI(t) tests := []ModifyTypeTest{ { "BIT(64)", diff --git a/go/libraries/doltcore/sqle/altertests/modify_bit8_test.go b/go/libraries/doltcore/sqle/altertests/modify_bit8_test.go index 0c33a74ca9..a8cb2db4e1 100644 --- a/go/libraries/doltcore/sqle/altertests/modify_bit8_test.go +++ b/go/libraries/doltcore/sqle/altertests/modify_bit8_test.go @@ -19,6 +19,7 @@ import ( ) func TestModifyTypeBit8(t *testing.T) { + SkipByDefaultInCI(t) tests := []ModifyTypeTest{ { "BIT(8)", diff --git a/go/libraries/doltcore/sqle/altertests/modify_decimal15_0_test.go b/go/libraries/doltcore/sqle/altertests/modify_decimal15_0_test.go index facf3a8164..ab1b97ffea 100644 --- a/go/libraries/doltcore/sqle/altertests/modify_decimal15_0_test.go +++ b/go/libraries/doltcore/sqle/altertests/modify_decimal15_0_test.go @@ -19,6 +19,7 @@ import ( ) func TestModifyTypeDecimal15_0(t *testing.T) { + SkipByDefaultInCI(t) tests := []ModifyTypeTest{ { "DECIMAL(15,0)", diff --git a/go/libraries/doltcore/sqle/altertests/modify_decimal1_0_test.go b/go/libraries/doltcore/sqle/altertests/modify_decimal1_0_test.go index 5a9a0d12ed..d981f14b5c 100644 --- a/go/libraries/doltcore/sqle/altertests/modify_decimal1_0_test.go +++ b/go/libraries/doltcore/sqle/altertests/modify_decimal1_0_test.go @@ -19,6 +19,7 @@ import ( ) func TestModifyTypeDecimal1(t *testing.T) { + SkipByDefaultInCI(t) tests := []ModifyTypeTest{ { "DECIMAL(1)", diff --git a/go/libraries/doltcore/sqle/altertests/modify_decimal30_0_test.go b/go/libraries/doltcore/sqle/altertests/modify_decimal30_0_test.go index 917de4a11a..d3854a1210 100644 --- a/go/libraries/doltcore/sqle/altertests/modify_decimal30_0_test.go +++ b/go/libraries/doltcore/sqle/altertests/modify_decimal30_0_test.go @@ -19,6 +19,7 @@ import ( ) func TestModifyTypeDecimal30_0(t *testing.T) { + SkipByDefaultInCI(t) tests := []ModifyTypeTest{ { "DECIMAL(30,0)", diff --git a/go/libraries/doltcore/sqle/altertests/modify_decimal65_0_test.go b/go/libraries/doltcore/sqle/altertests/modify_decimal65_0_test.go index e9fd5c9d0d..7721cea035 100644 --- a/go/libraries/doltcore/sqle/altertests/modify_decimal65_0_test.go +++ b/go/libraries/doltcore/sqle/altertests/modify_decimal65_0_test.go @@ -19,6 +19,7 @@ import ( ) func TestModifyTypeDecimal65_0(t *testing.T) { + SkipByDefaultInCI(t) tests := []ModifyTypeTest{ { "DECIMAL(65,0)", diff --git a/go/libraries/doltcore/sqle/altertests/modify_decimal65_1_test.go b/go/libraries/doltcore/sqle/altertests/modify_decimal65_1_test.go index a7c991e631..3a859e5af4 100644 --- a/go/libraries/doltcore/sqle/altertests/modify_decimal65_1_test.go +++ b/go/libraries/doltcore/sqle/altertests/modify_decimal65_1_test.go @@ -19,6 +19,7 @@ import ( ) func TestModifyTypeDecimal65_1(t *testing.T) { + SkipByDefaultInCI(t) tests := []ModifyTypeTest{ { "DECIMAL(65,1)", diff --git a/go/libraries/doltcore/sqle/altertests/modify_double_test.go b/go/libraries/doltcore/sqle/altertests/modify_double_test.go index 27b1663207..2cce1c718d 100644 --- a/go/libraries/doltcore/sqle/altertests/modify_double_test.go +++ b/go/libraries/doltcore/sqle/altertests/modify_double_test.go @@ -19,6 +19,7 @@ import ( ) func TestModifyTypeDouble(t *testing.T) { + SkipByDefaultInCI(t) tests := []ModifyTypeTest{ { "DOUBLE", diff --git a/go/libraries/doltcore/sqle/altertests/modify_float_test.go b/go/libraries/doltcore/sqle/altertests/modify_float_test.go index 30f47b8c15..0c90008c4b 100644 --- a/go/libraries/doltcore/sqle/altertests/modify_float_test.go +++ b/go/libraries/doltcore/sqle/altertests/modify_float_test.go @@ -19,6 +19,7 @@ import ( ) func TestModifyTypeFloat(t *testing.T) { + SkipByDefaultInCI(t) tests := []ModifyTypeTest{ { "FLOAT", diff --git a/go/libraries/doltcore/sqle/altertests/modify_int_test.go b/go/libraries/doltcore/sqle/altertests/modify_int_test.go index 63f083c124..0ada57fe37 100644 --- a/go/libraries/doltcore/sqle/altertests/modify_int_test.go +++ b/go/libraries/doltcore/sqle/altertests/modify_int_test.go @@ -19,6 +19,7 @@ import ( ) func TestModifyTypeInt(t *testing.T) { + SkipByDefaultInCI(t) tests := []ModifyTypeTest{ { "INT", diff --git a/go/libraries/doltcore/sqle/altertests/modify_int_unsigned_test.go b/go/libraries/doltcore/sqle/altertests/modify_int_unsigned_test.go index e5fe44ee18..1cbef85826 100644 --- a/go/libraries/doltcore/sqle/altertests/modify_int_unsigned_test.go +++ b/go/libraries/doltcore/sqle/altertests/modify_int_unsigned_test.go @@ -19,6 +19,7 @@ import ( ) func TestModifyTypeIntUnsigned(t *testing.T) { + SkipByDefaultInCI(t) tests := []ModifyTypeTest{ { "INT UNSIGNED", diff --git a/go/libraries/doltcore/sqle/altertests/modify_mediumint_test.go b/go/libraries/doltcore/sqle/altertests/modify_mediumint_test.go index 708a5cf29e..e6099e8c34 100644 --- a/go/libraries/doltcore/sqle/altertests/modify_mediumint_test.go +++ b/go/libraries/doltcore/sqle/altertests/modify_mediumint_test.go @@ -19,6 +19,7 @@ import ( ) func TestModifyTypeMediumint(t *testing.T) { + SkipByDefaultInCI(t) tests := []ModifyTypeTest{ { "MEDIUMINT", diff --git a/go/libraries/doltcore/sqle/altertests/modify_mediumint_unsigned_test.go b/go/libraries/doltcore/sqle/altertests/modify_mediumint_unsigned_test.go index aa23542eeb..37cec62283 100644 --- a/go/libraries/doltcore/sqle/altertests/modify_mediumint_unsigned_test.go +++ b/go/libraries/doltcore/sqle/altertests/modify_mediumint_unsigned_test.go @@ -19,6 +19,7 @@ import ( ) func TestModifyTypeMediumintUnsigned(t *testing.T) { + SkipByDefaultInCI(t) tests := []ModifyTypeTest{ { "MEDIUMINT UNSIGNED", diff --git a/go/libraries/doltcore/sqle/altertests/modify_smallint_test.go b/go/libraries/doltcore/sqle/altertests/modify_smallint_test.go index 3b94db22a6..4785b437fc 100644 --- a/go/libraries/doltcore/sqle/altertests/modify_smallint_test.go +++ b/go/libraries/doltcore/sqle/altertests/modify_smallint_test.go @@ -19,6 +19,7 @@ import ( ) func TestModifyTypeSmallint(t *testing.T) { + SkipByDefaultInCI(t) tests := []ModifyTypeTest{ { "SMALLINT", diff --git a/go/libraries/doltcore/sqle/altertests/modify_smallint_unsigned_test.go b/go/libraries/doltcore/sqle/altertests/modify_smallint_unsigned_test.go index e0a6159508..111a31ecd4 100644 --- a/go/libraries/doltcore/sqle/altertests/modify_smallint_unsigned_test.go +++ b/go/libraries/doltcore/sqle/altertests/modify_smallint_unsigned_test.go @@ -19,6 +19,7 @@ import ( ) func TestModifyTypeSmallintUnsigned(t *testing.T) { + SkipByDefaultInCI(t) tests := []ModifyTypeTest{ { "SMALLINT UNSIGNED", diff --git a/go/libraries/doltcore/sqle/altertests/modify_tinyint_test.go b/go/libraries/doltcore/sqle/altertests/modify_tinyint_test.go index fbcef09ae0..ada4d8e61b 100644 --- a/go/libraries/doltcore/sqle/altertests/modify_tinyint_test.go +++ b/go/libraries/doltcore/sqle/altertests/modify_tinyint_test.go @@ -19,6 +19,7 @@ import ( ) func TestModifyTypeTinyint(t *testing.T) { + SkipByDefaultInCI(t) tests := []ModifyTypeTest{ { "TINYINT", diff --git a/go/libraries/doltcore/sqle/altertests/modify_tinyint_unsigned_test.go b/go/libraries/doltcore/sqle/altertests/modify_tinyint_unsigned_test.go index 42add3d116..fef9a622c6 100644 --- a/go/libraries/doltcore/sqle/altertests/modify_tinyint_unsigned_test.go +++ b/go/libraries/doltcore/sqle/altertests/modify_tinyint_unsigned_test.go @@ -19,6 +19,7 @@ import ( ) func TestModifyTypeTinyintUnsigned(t *testing.T) { + SkipByDefaultInCI(t) tests := []ModifyTypeTest{ { "TINYINT UNSIGNED",