From 9505e90092df6907cb584702a56521c26e8ddc47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Mon, 10 Apr 2023 11:07:12 +0100 Subject: [PATCH] cmd/cue: remove skipped test scripts for fixing old definitions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These tests have been disabled since `cue fix` stopped fixing old-style definitions like `foo :: bar`, back in July 2020 via https://cue-review.googlesource.com/c/cue/+/6656. That change disabled the scripts rather than removing them entirely, with a note to keep them around until we were sure about the change. It's been nearly three years since the tests were disabled, and support for `::` was removed entirely in February 2023 via https://cuelang.org/cl/546886, so there's no going back for sure. The test scripts are always in the git history for reference if needed. Signed-off-by: Daniel Martí Change-Id: I2a90f69cbf9c90c99aef851781e19730f4b08c47 Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/552384 Unity-Result: CUEcueckoo TryBot-Result: CUEcueckoo Reviewed-by: Paul Jolly --- cmd/cue/cmd/testdata/script/fix.txtar | 118 -------------------- cmd/cue/cmd/testdata/script/fix_files.txtar | 89 --------------- cmd/cue/cmd/testdata/script/fix_pkg.txtar | 99 ---------------- 3 files changed, 306 deletions(-) delete mode 100644 cmd/cue/cmd/testdata/script/fix.txtar delete mode 100644 cmd/cue/cmd/testdata/script/fix_files.txtar delete mode 100644 cmd/cue/cmd/testdata/script/fix_pkg.txtar diff --git a/cmd/cue/cmd/testdata/script/fix.txtar b/cmd/cue/cmd/testdata/script/fix.txtar deleted file mode 100644 index a6cb5b26578..00000000000 --- a/cmd/cue/cmd/testdata/script/fix.txtar +++ /dev/null @@ -1,118 +0,0 @@ -skip 'No longer supported, but keeping around until for sure.' - -exec cue fix - -cmp foo/foo.cue expect/foo/foo_cue -cmp foo/foo_test.cue expect/foo/foo_test_cue -cmp foo/foo_tool.cue expect/foo/foo_tool_cue -cmp bar/bar.cue expect/bar/bar_cue -cmp cue.mod/pkg/foobar.org/notimported/notimported.cue expect/cue.mod/pkg/foobar.org/notimported/notimported.cue -cmp cue.mod/gen/foobar.org/imported/imported.cue expect/cue.mod/gen/foobar.org/imported/imported.cue - --- cue.mod/module.cue -- -module: "mod.test" --- cue.mod/pkg/foobar.org/notimported/notimported.cue -- -package notimported - -Foo :: { - x: int -} -a: Foo --- cue.mod/gen/foobar.org/imported/imported.cue -- -package imported - -Bar :: { - x: int -} --- bar/bar.cue -- -package bar - -import ( - "mod.test/foo" - "foobar.org/imported" -) - -A :: foo.Def & { - a: >10 - - B :: { c: int } -} - -b: A & { a: 11 } - -c: imported.Bar & { a: 11 } - -d: A.B.c -e: [...A.B.c] - --- foo/foo.cue -- -package foo - -Def :: { - a: int - b: string -} - -a: Def -c: [Def.b]: int - --- foo/foo_test.cue -- -package foo - -A :: int - --- expect/foo/foo_test_cue -- -package foo - -#A: int --- foo/foo_tool.cue -- -package foo - -B :: int - --- expect/foo/foo_tool_cue -- -package foo - -#B: int --- expect/bar/bar_cue -- -package bar - -import ( - "mod.test/foo" - "foobar.org/imported" -) - -#A: foo.#Def & { - a: >10 - #B: {c: int} -} - -b: #A & {a: 11} - -c: imported.#Bar & {a: 11} - -d: #A.#B.c -e: [...#A.#B.c] --- expect/foo/foo_cue -- -package foo - -#Def: { - a: int - b: string -} - -a: #Def -c: [#Def.b]: int --- expect/cue.mod/pkg/foobar.org/notimported/notimported.cue -- -package notimported - -#Foo: { - x: int -} -a: #Foo --- expect/cue.mod/gen/foobar.org/imported/imported.cue -- -package imported - -#Bar: { - x: int -} \ No newline at end of file diff --git a/cmd/cue/cmd/testdata/script/fix_files.txtar b/cmd/cue/cmd/testdata/script/fix_files.txtar deleted file mode 100644 index 265e594f1d4..00000000000 --- a/cmd/cue/cmd/testdata/script/fix_files.txtar +++ /dev/null @@ -1,89 +0,0 @@ -skip 'No longer supported, but keeping around until for sure.' - -exec cue fix ./foo/foo.cue ./bar/bar.cue - -cmp foo/foo.cue expect/foo/foo_cue -cmp bar/bar.cue expect/bar/bar_cue -cmp cue.mod/pkg/foobar.org/notimported/notimported.cue expect/cue.mod/pkg/foobar.org/notimported/notimported.cue -cmp cue.mod/gen/foobar.org/imported/imported.cue expect/cue.mod/gen/foobar.org/imported/imported.cue - --- cue.mod/module.cue -- -module: "mod.test" --- cue.mod/pkg/foobar.org/notimported/notimported.cue -- -package notimported - -Foo :: { - x: int -} -a: Foo --- cue.mod/gen/foobar.org/imported/imported.cue -- -package imported - -Bar :: { - x: int -} --- bar/bar.cue -- -package bar - -import ( - "foobar.org/imported" -) - -A :: { - B :: { c: int } -} - -b: A & { a: 11 } - -d: imported.Bar & { a: 11 } - -d: A.B.c -e: [...A.B.c] - --- foo/foo.cue -- -Def :: { - a: int - b: string -} - -a: Def -c: [Def.b]: int - --- expect/bar/bar_cue -- -package bar - -import ( - "foobar.org/imported" -) - -#A: { - #B: {c: int} -} - -b: #A & {a: 11} - -d: imported.#Bar & {a: 11} - -d: #A.#B.c -e: [...#A.#B.c] --- expect/foo/foo_cue -- -#Def: { - a: int - b: string -} - -a: #Def -c: [#Def.b]: int --- expect/cue.mod/pkg/foobar.org/notimported/notimported.cue -- -package notimported - -Foo :: { - x: int -} -a: Foo --- expect/cue.mod/gen/foobar.org/imported/imported.cue -- -package imported - -Bar :: { - x: int -} \ No newline at end of file diff --git a/cmd/cue/cmd/testdata/script/fix_pkg.txtar b/cmd/cue/cmd/testdata/script/fix_pkg.txtar deleted file mode 100644 index 3e4295c8682..00000000000 --- a/cmd/cue/cmd/testdata/script/fix_pkg.txtar +++ /dev/null @@ -1,99 +0,0 @@ -skip 'No longer supported, but keeping around until for sure.' - -exec cue fix ./bar foobar.org/notimported - -cmp foo/foo.cue expect/foo/foo_cue -cmp bar/bar.cue expect/bar/bar_cue -cmp cue.mod/pkg/foobar.org/notimported/notimported.cue expect/cue.mod/pkg/foobar.org/notimported/notimported.cue -cmp cue.mod/gen/foobar.org/imported/imported.cue expect/cue.mod/gen/foobar.org/imported/imported.cue - --- cue.mod/module.cue -- -module: "mod.test" --- cue.mod/pkg/foobar.org/notimported/notimported.cue -- -package notimported - -Foo :: { - x: int -} -a: Foo --- cue.mod/gen/foobar.org/imported/imported.cue -- -package imported - -Bar :: { - x: int -} --- bar/bar.cue -- -package bar - -import ( - "mod.test/foo" - "foobar.org/imported" -) - -A :: foo.Def & { - a: >10 - - B :: { c: int } -} - -b: A & { a: 11 } - -c: imported.Bar & { a: 11 } - -d: A.B.c -e: [...A.B.c] - --- foo/foo.cue -- -package foo - -Def :: { - a: int - b: string -} - -a: Def -c: [Def.b]: int - --- expect/bar/bar_cue -- -package bar - -import ( - "mod.test/foo" - "foobar.org/imported" -) - -#A: foo.#Def & { - a: >10 - #B: {c: int} -} - -b: #A & {a: 11} - -c: imported.#Bar & {a: 11} - -d: #A.#B.c -e: [...#A.#B.c] --- expect/foo/foo_cue -- -package foo - -Def :: { - a: int - b: string -} - -a: Def -c: [Def.b]: int - --- expect/cue.mod/pkg/foobar.org/notimported/notimported.cue -- -package notimported - -#Foo: { - x: int -} -a: #Foo --- expect/cue.mod/gen/foobar.org/imported/imported.cue -- -package imported - -Bar :: { - x: int -} \ No newline at end of file