Delete a test fixture we don't need (vercel#4558)

NicholasLYang · Apr 21, 2023 · 0901653 · 0901653
1 parent 43aefe5
commit 0901653
Show file tree

Hide file tree

Showing 12 changed files with 65 additions and 78 deletions.
diff --git a/cli/integration_tests/_fixtures/single_package_no_config/.gitignore b/cli/integration_tests/_fixtures/single_package_no_config/.gitignore
diff --git a/cli/integration_tests/_fixtures/single_package_no_config/package.json b/cli/integration_tests/_fixtures/single_package_no_config/package.json
diff --git a/cli/integration_tests/dry_json/single_package_no_config.t b/cli/integration_tests/dry_json/single_package_no_config.t
@@ -1,6 +1,8 @@
 Setup
   $ . ${TESTDIR}/../_helpers/setup.sh
-  $ . ${TESTDIR}/../_helpers/setup_monorepo.sh $(pwd) single_package_no_config
+  $ . ${TESTDIR}/../_helpers/setup_monorepo.sh $(pwd) single_package
+  $ rm turbo.json
+  $ git commit -am "Delete turbo config" --quiet
 
   $ ${TURBO} run build --dry=json
   {
@@ -11,7 +13,7 @@ Setup
       "rootKey": "Buffalo buffalo Buffalo buffalo buffalo buffalo Buffalo buffalo",
       "files": {
         "package-lock.json": "8db0df575e6509336a6719094b63eb23d2c649c1",
-        "package.json": "581fe2b8dcba5b03cbe51d78a973143eb6d33e3a"
+        "package.json": "185771929d92c3865ce06c863c07d357500d3364"
       },
       "hashOfExternalDependencies": "",
       "rootPipeline": {
@@ -30,11 +32,12 @@ Setup
       {
         "taskId": "build",
         "task": "build",
-        "hash": "c7223f212c321d3b",
+        "hash": "5b5ae44052e3d624",
         "inputs": {
-          ".gitignore": "38548b0538f2fc563d6bacf70dd42798c6fd9a35",
+          ".gitignore": "6f23ff6842b5526da43ab38f4a5bf3b0158eeb42",
           "package-lock.json": "8db0df575e6509336a6719094b63eb23d2c649c1",
-          "package.json": "581fe2b8dcba5b03cbe51d78a973143eb6d33e3a"
+          "package.json": "185771929d92c3865ce06c863c07d357500d3364",
+          "somefile.txt": "45b983be36b73c0788dc9cbcb76cbb80fc7bb057"
         },
         "hashOfExternalDependencies": "",
         "cache": {
@@ -43,7 +46,7 @@ Setup
           "status": "MISS",
           "timeSaved": 0
         },
-        "command": "echo 'building'",
+        "command": "echo 'building' \u003e foo",
         "cliArguments": [],
         "outputs": null,
         "excludedOutputs": null,

diff --git a/cli/integration_tests/single_package/dry-run.t b/cli/integration_tests/single_package/dry-run.t
@@ -3,7 +3,7 @@ Setup
   $ . ${TESTDIR}/../_helpers/setup_monorepo.sh $(pwd) single_package
 
 Check
-  $ ${TURBO} run build --dry --single-package
+  $ ${TURBO} run build --dry
 
   Global Hash Inputs
     Global Files               = 3

diff --git a/cli/integration_tests/single_package/graph.t b/cli/integration_tests/single_package/graph.t
@@ -3,7 +3,7 @@ Setup
   $ . ${TESTDIR}/../_helpers/setup_monorepo.sh $(pwd) single_package
 
 Graph
-  $ ${TURBO} run build --single-package --graph
+  $ ${TURBO} run build --graph
 
   digraph {
   \tcompound = "true" (esc)

diff --git a/cli/integration_tests/single_package/no-config-graph.t b/cli/integration_tests/single_package/no-config-graph.t
diff --git a/cli/integration_tests/single_package/no-config-run.t b/cli/integration_tests/single_package/no-config-run.t
diff --git a/..._tests/single_package/no-config-dry-run.t → ...egration_tests/single_package/no-config.t b/..._tests/single_package/no-config-dry-run.t → ...egration_tests/single_package/no-config.t
@@ -1,9 +1,11 @@
 Setup
   $ . ${TESTDIR}/../_helpers/setup.sh
-  $ . ${TESTDIR}/../_helpers/setup_monorepo.sh $(pwd) single_package_no_config
+  $ . ${TESTDIR}/../_helpers/setup_monorepo.sh $(pwd) single_package
+  $ rm turbo.json
+  $ git commit -am "Delete turbo config" --quiet
 
 Check
-  $ ${TURBO} run build --dry --single-package
+  $ ${TURBO} run build --dry
 
   Global Hash Inputs
     Global Files               = 2
@@ -14,17 +16,56 @@ Check
   Tasks to Run
   build
     Task                             = build                                                                                                   
-    Hash                             = c7223f212c321d3b                                                                                        
+    Hash                             = 5b5ae44052e3d624                                                                                        
     Cached (Local)                   = false                                                                                                   
     Cached (Remote)                  = false                                                                                                   
-    Command                          = echo 'building'                                                                                         
+    Command                          = echo 'building' > foo                                                                                   
     Outputs                          =                                                                                                         
     Log File                         = .turbo/turbo-build.log                                                                                  
     Dependencies                     =                                                                                                         
     Dependendents                    =                                                                                                         
-    Inputs Files Considered          = 3                                                                                                       
+    Inputs Files Considered          = 4                                                                                                       
     Configured Environment Variables =                                                                                                         
     Inferred Environment Variables   =                                                                                                         
     Global Environment Variables     = VERCEL_ANALYTICS_ID=                                                                                    
     ResolvedTaskDefinition           = {"outputs":[],"cache":false,"dependsOn":[],"inputs":[],"outputMode":"full","env":[],"persistent":false} 
     Framework                        = <NO FRAMEWORK DETECTED>                                                                                 
+
+  $ ${TURBO} run build --graph
+
+  digraph {
+  \tcompound = "true" (esc)
+  \tnewrank = "true" (esc)
+  \tsubgraph "root" { (esc)
+  \t\t"[root] build" -> "[root] ___ROOT___" (esc)
+  \t} (esc)
+  }
+
+Run real once
+  $ ${TURBO} run build
+  \xe2\x80\xa2 Running build (esc)
+  \xe2\x80\xa2 Remote caching disabled (esc)
+  build: cache bypass, force executing 5b5ae44052e3d624
+  build: 
+  build: > build
+  build: > echo 'building' > foo
+  build: 
+
+   Tasks:    1 successful, 1 total
+  Cached:    0 cached, 1 total
+    Time:\s*[\.0-9]+m?s  (re)
+
+Run a second time, verify no caching because there is no config
+  $ ${TURBO} run build --single-package
+  \xe2\x80\xa2 Running build (esc)
+  \xe2\x80\xa2 Remote caching disabled (esc)
+  build: cache bypass, force executing 5b5ae44052e3d624
+  build: 
+  build: > build
+  build: > echo 'building' > foo
+  build: 
+
+   Tasks:    1 successful, 1 total
+  Cached:    0 cached, 1 total
+    Time:\s*[\.0-9]+m?s  (re)
+
diff --git a/cli/integration_tests/single_package/run.t b/cli/integration_tests/single_package/run.t
@@ -3,7 +3,7 @@ Setup
   $ . ${TESTDIR}/../_helpers/setup_monorepo.sh $(pwd) single_package
 
 Check
-  $ ${TURBO} run build --single-package
+  $ ${TURBO} run build
   \xe2\x80\xa2 Running build (esc)
   \xe2\x80\xa2 Remote caching disabled (esc)
   build: cache miss, executing dd4a9a7b508b0e38

diff --git a/cli/integration_tests/single_package/with-deps-dry-run.t b/cli/integration_tests/single_package/with-deps-dry-run.t
@@ -3,7 +3,7 @@ Setup
   $ . ${TESTDIR}/../_helpers/setup_monorepo.sh $(pwd) single_package_deps
 
 Check
-  $ ${TURBO} run test --dry --single-package
+  $ ${TURBO} run test --dry
 
   Global Hash Inputs
     Global Files               = 2

diff --git a/cli/integration_tests/single_package/with-deps-graph.t b/cli/integration_tests/single_package/with-deps-graph.t
@@ -3,7 +3,7 @@ Setup
   $ . ${TESTDIR}/../_helpers/setup_monorepo.sh $(pwd) single_package_deps
 
 Graph
-  $ ${TURBO} run test --single-package --graph
+  $ ${TURBO} run test --graph
 
   digraph {
   \tcompound = "true" (esc)

diff --git a/cli/integration_tests/single_package/with-deps-run.t b/cli/integration_tests/single_package/with-deps-run.t
@@ -3,7 +3,7 @@ Setup
   $ . ${TESTDIR}/../_helpers/setup_monorepo.sh $(pwd) single_package_deps
 
 Check
-  $ ${TURBO} run test --single-package
+  $ ${TURBO} run test
   \xe2\x80\xa2 Running test (esc)
   \xe2\x80\xa2 Remote caching disabled (esc)
   build: cache miss, executing 8fc80cfff3b64237
@@ -22,7 +22,7 @@ Check
     Time:\s*[\.0-9]+m?s  (re)
 
 Run a second time, verify caching works because there is a config
-  $ ${TURBO} run test --single-package
+  $ ${TURBO} run test
   \xe2\x80\xa2 Running test (esc)
   \xe2\x80\xa2 Remote caching disabled (esc)
   build: cache hit, replaying output 8fc80cfff3b64237
@@ -41,7 +41,7 @@ Run a second time, verify caching works because there is a config
     Time:\s*[\.0-9]+m?s >>> FULL TURBO (re)
 
 Run with --output-logs=hash-only
-  $ ${TURBO} run test --single-package --output-logs=hash-only
+  $ ${TURBO} run test --output-logs=hash-only
   \xe2\x80\xa2 Running test (esc)
   \xe2\x80\xa2 Remote caching disabled (esc)
   build: cache hit, suppressing output 8fc80cfff3b64237
@@ -52,7 +52,7 @@ Run with --output-logs=hash-only
     Time:\s*[\.0-9]+m?s >>> FULL TURBO (re)
 
 Run with --output-logs=errors-only
-  $ ${TURBO} run test --single-package --output-logs=errors-only
+  $ ${TURBO} run test --output-logs=errors-only
   \xe2\x80\xa2 Running test (esc)
   \xe2\x80\xa2 Remote caching disabled (esc)
 
@@ -61,7 +61,7 @@ Run with --output-logs=errors-only
     Time:\s*[\.0-9]+m?s >>> FULL TURBO (re)
 
 Run with --output-logs=none
-  $ ${TURBO} run test --single-package --output-logs=none
+  $ ${TURBO} run test --output-logs=none
   \xe2\x80\xa2 Running test (esc)
   \xe2\x80\xa2 Remote caching disabled (esc)