From cbcbb30216c13ead808a8811c52b2142c110e22c Mon Sep 17 00:00:00 2001 From: Greg Magolan Date: Mon, 22 Apr 2019 19:27:04 -0700 Subject: [PATCH] Remove /internal/e2e/bazel_workspaces as this coverage is handled by 'bazel run @test_workspace//:bin' Once https://github.com/bazelbuild/bazel/pull/8090 it can be covered with 'bazel test @test_workspace//...' instead --- .bazelignore | 1 - internal/e2e/bazel_workspaces/.bazelrc | 5 - internal/e2e/bazel_workspaces/BUILD.bazel | 1 - internal/e2e/bazel_workspaces/WORKSPACE | 25 ----- .../npm/test_workspace/WORKSPACE | 18 ---- .../npm/test_workspace/package.json | 12 --- .../npm/test_workspace/src/BUILD.bazel | 7 -- .../npm/test_workspace/src/test.spec.js | 5 - .../npm/test_workspace/yarn.lock | 3 - internal/e2e/bazel_workspaces/package.json | 8 -- internal/e2e/bazel_workspaces/yarn.lock | 93 ------------------- 11 files changed, 178 deletions(-) delete mode 100644 internal/e2e/bazel_workspaces/.bazelrc delete mode 100644 internal/e2e/bazel_workspaces/BUILD.bazel delete mode 100644 internal/e2e/bazel_workspaces/WORKSPACE delete mode 100644 internal/e2e/bazel_workspaces/npm/test_workspace/WORKSPACE delete mode 100644 internal/e2e/bazel_workspaces/npm/test_workspace/package.json delete mode 100644 internal/e2e/bazel_workspaces/npm/test_workspace/src/BUILD.bazel delete mode 100644 internal/e2e/bazel_workspaces/npm/test_workspace/src/test.spec.js delete mode 100644 internal/e2e/bazel_workspaces/npm/test_workspace/yarn.lock delete mode 100644 internal/e2e/bazel_workspaces/package.json delete mode 100644 internal/e2e/bazel_workspaces/yarn.lock diff --git a/.bazelignore b/.bazelignore index 83a990a989..25b17c0200 100644 --- a/.bazelignore +++ b/.bazelignore @@ -10,7 +10,6 @@ examples/ packages/ # A subset of legacy e2e tests are nested workspaces # TODO(gregmagolan): move these to /e2e -internal/e2e/bazel_workspaces internal/e2e/bazel_workspaces_compat internal/e2e/fine_grained_symlinks internal/e2e/node_loader_no_preserve_symlinks diff --git a/internal/e2e/bazel_workspaces/.bazelrc b/internal/e2e/bazel_workspaces/.bazelrc deleted file mode 100644 index c51937165c..0000000000 --- a/internal/e2e/bazel_workspaces/.bazelrc +++ /dev/null @@ -1,5 +0,0 @@ -# Print test logs for failed tests -test --test_output=errors - -# Enable debugging tests with --config=debug -test:debug --test_arg=--node_options=--inspect-brk --test_output=streamed --test_strategy=exclusive --test_timeout=9999 --nocache_test_results diff --git a/internal/e2e/bazel_workspaces/BUILD.bazel b/internal/e2e/bazel_workspaces/BUILD.bazel deleted file mode 100644 index f8b3c38bd8..0000000000 --- a/internal/e2e/bazel_workspaces/BUILD.bazel +++ /dev/null @@ -1 +0,0 @@ -# Marker file that this directory is a bazel package diff --git a/internal/e2e/bazel_workspaces/WORKSPACE b/internal/e2e/bazel_workspaces/WORKSPACE deleted file mode 100644 index c6b9390d2d..0000000000 --- a/internal/e2e/bazel_workspaces/WORKSPACE +++ /dev/null @@ -1,25 +0,0 @@ -workspace(name = "bazel_workspaces") - -local_repository( - name = "build_bazel_rules_nodejs", - path = "../../../dist/build_bazel_rules_nodejs/release", -) - -load("@build_bazel_rules_nodejs//:defs.bzl", "yarn_install") - -yarn_install( - name = "npm", - data = [ - "@bazel_workspaces//:npm/test_workspace/WORKSPACE", - "@bazel_workspaces//:npm/test_workspace/package.json", - "@bazel_workspaces//:npm/test_workspace/src/BUILD.bazel", - "@bazel_workspaces//:npm/test_workspace/src/test.spec.js", - "@bazel_workspaces//:npm/test_workspace/yarn.lock", - ], - package_json = "//:package.json", - yarn_lock = "//:yarn.lock", -) - -load("@npm//:install_bazel_dependencies.bzl", "install_bazel_dependencies") - -install_bazel_dependencies() diff --git a/internal/e2e/bazel_workspaces/npm/test_workspace/WORKSPACE b/internal/e2e/bazel_workspaces/npm/test_workspace/WORKSPACE deleted file mode 100644 index dca160b2fe..0000000000 --- a/internal/e2e/bazel_workspaces/npm/test_workspace/WORKSPACE +++ /dev/null @@ -1,18 +0,0 @@ -workspace(name = "test_workspace") - -local_repository( - name = "build_bazel_rules_nodejs", - path = "../../../../../dist/build_bazel_rules_nodejs/release", -) - -load("@build_bazel_rules_nodejs//:defs.bzl", "yarn_install") - -yarn_install( - name = "npm", - package_json = "//:package.json", - yarn_lock = "//:yarn.lock", -) - -load("@npm//:install_bazel_dependencies.bzl", "install_bazel_dependencies") - -install_bazel_dependencies() diff --git a/internal/e2e/bazel_workspaces/npm/test_workspace/package.json b/internal/e2e/bazel_workspaces/npm/test_workspace/package.json deleted file mode 100644 index 5351b8c11d..0000000000 --- a/internal/e2e/bazel_workspaces/npm/test_workspace/package.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "test_workspace", - "version": "0.0.1", - "dependencies": { - "jasmine": "3.3.1" - }, - "bazelWorkspaces": { - "test_workspace": { - "rootPath": "." - } - } -} diff --git a/internal/e2e/bazel_workspaces/npm/test_workspace/src/BUILD.bazel b/internal/e2e/bazel_workspaces/npm/test_workspace/src/BUILD.bazel deleted file mode 100644 index cd79b7e1d2..0000000000 --- a/internal/e2e/bazel_workspaces/npm/test_workspace/src/BUILD.bazel +++ /dev/null @@ -1,7 +0,0 @@ -load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test") - -jasmine_node_test( - name = "test", - srcs = ["test.spec.js"], - deps = ["@npm//jasmine"], -) diff --git a/internal/e2e/bazel_workspaces/npm/test_workspace/src/test.spec.js b/internal/e2e/bazel_workspaces/npm/test_workspace/src/test.spec.js deleted file mode 100644 index 283177e952..0000000000 --- a/internal/e2e/bazel_workspaces/npm/test_workspace/src/test.spec.js +++ /dev/null @@ -1,5 +0,0 @@ -describe('should', () => { - it('run', () => { - expect(1).toBe(1); - }); -}); diff --git a/internal/e2e/bazel_workspaces/npm/test_workspace/yarn.lock b/internal/e2e/bazel_workspaces/npm/test_workspace/yarn.lock deleted file mode 100644 index c37fc613a5..0000000000 --- a/internal/e2e/bazel_workspaces/npm/test_workspace/yarn.lock +++ /dev/null @@ -1,3 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - diff --git a/internal/e2e/bazel_workspaces/package.json b/internal/e2e/bazel_workspaces/package.json deleted file mode 100644 index 5c9e5ebaa4..0000000000 --- a/internal/e2e/bazel_workspaces/package.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "test_workspaces": "file:./npm/test_workspace" - }, - "scripts": { - "test": "bazel test @test_workspace//..." - } -} diff --git a/internal/e2e/bazel_workspaces/yarn.lock b/internal/e2e/bazel_workspaces/yarn.lock deleted file mode 100644 index 12ecff4ab2..0000000000 --- a/internal/e2e/bazel_workspaces/yarn.lock +++ /dev/null @@ -1,93 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -balanced-match@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" - integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= - -brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= - -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= - -glob@^7.0.6: - version "7.1.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1" - integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= - -jasmine-core@~3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.3.0.tgz#dea1cdc634bc93c7e0d4ad27185df30fa971b10e" - integrity sha512-3/xSmG/d35hf80BEN66Y6g9Ca5l/Isdeg/j6zvbTYlTzeKinzmaTM4p9am5kYqOmE05D7s1t8FGjzdSnbUbceA== - -jasmine@3.3.1: - version "3.3.1" - resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-3.3.1.tgz#d61bb1dd8888859bd11ea83074a78ee13d949905" - integrity sha512-/vU3/H7U56XsxIXHwgEuWpCgQ0bRi2iiZeUpx7Nqo8n1TpoDHfZhkPIc7CO8I4pnMzYsi3XaSZEiy8cnTfujng== - dependencies: - glob "^7.0.6" - jasmine-core "~3.3.0" - -minimatch@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== - dependencies: - brace-expansion "^1.1.7" - -once@^1.3.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= - dependencies: - wrappy "1" - -path-is-absolute@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= - -"test_workspaces@file:./npm/test_workspace": - version "0.0.1" - dependencies: - jasmine "3.3.1" - -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=