fix

Mandukhai-Alimaa · Mandukhai-Alimaa · commit 8fc2ad36fc26 · 2025-07-15T18:39:30.000-05:00
diff --git a/Makefile b/Makefile
@@ -39,7 +39,7 @@ wasm-functions:
 native-functions: imgs/ol-wasm
 	cd bin-functions && cross build --release
 	bash ./bin-functions/install-native.sh test-dir/registry
-	ls test-dir/registry/hashing.tar.gz test-dir/registry/noop.tar.gz # guarantee they were created
+	ls registry/hashing.tar.gz registry/noop.tar.gz # guarantee they were created
 
 update-dependencies:
 	cd wasm-image/runtimes/native && cargo update
diff --git a/scripts/bin_test.py b/scripts/bin_test.py
@@ -77,7 +77,7 @@ def _main():
     parser.add_argument('--test_filter', type=str, default="")
     parser.add_argument('--worker_type', type=str, default="sock")
     parser.add_argument('--ol_dir', type=str, default="test-dir")
-    parser.add_argument('--registry', type=str, default="")
+    parser.add_argument('--registry', type=str, default="test-registry")
 
     args = parser.parse_args()
 
@@ -103,7 +103,8 @@ def _main():
 
         start_tests()
 
-        with TestConfContext():
+        registry =  "file://" + os.path.abspath(args.registry)
+        with TestConfContext(registry=registry):
             run_tests()
 
     check_test_results()
diff --git a/scripts/sock_test.py b/scripts/sock_test.py
@@ -138,7 +138,7 @@ def main():
     prepare_open_lambda(args.ol_dir)
 
     start_tests()
-    with TestConfContext(limits={"installer_mem_mb": 250}):
+    with TestConfContext(registry= "file://" + os.path.abspath(args.registry), limits={"installer_mem_mb": 250}):
         run_tests()
     check_test_results()
 
diff --git a/scripts/test.py b/scripts/test.py
@@ -386,7 +386,7 @@ def main():
     parser.add_argument('--test_blocklist', type=str, default="")
     parser.add_argument('--registry', type=str, default="")  # Will use worker registry by default
     parser.add_argument('--ol_dir', type=str, default="test-dir")
-    parser.add_argument('--image', type=str, default="ol-min")
+    parser.add_argument('--image', type=str, default="ol-wasm")
 
     args = parser.parse_args()
 
@@ -402,14 +402,17 @@ def main():
     setup_config(args.ol_dir)
     prepare_open_lambda(args.ol_dir, args.image)
 
+    # Use worker registry directory from config
+    registry_path = "file://" + os.path.abspath(os.path.join(args.ol_dir, "registry"))
+
     trace_config = {
         "cgroups": True,
         "memory": True,
         "evictor": True,
         "package": True,
     }
 
-    with TestConfContext(trace=trace_config):
+    with TestConfContext(registry=registry_path, trace=trace_config):
         if args.worker_type == 'docker':
             set_worker_type(DockerWorker)
         elif args.worker_type == 'sock':
diff --git a/src/worker/helpers.go b/src/worker/helpers.go
@@ -125,12 +125,7 @@ func initOLDir(olPath string, dockerBaseImage string, newBase bool) (err error)
 				}
 			}
 		} else {
-			// Directory exists but doesn't contain a valid OL deployment
-			// Remove it and create a fresh one
-			fmt.Printf("Directory %s exists but is not a valid OL deployment. Removing it.\n", olPath)
-			if err := os.RemoveAll(olPath); err != nil {
-				return fmt.Errorf("failed to remove invalid OL directory %s: %w", olPath, err)
-			}
+			return fmt.Errorf("Directory %s already exists but does not contain a previous OL deployment", olPath)
 		}
 	} else {
 		if err := os.Mkdir(olPath, 0700); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -125,12 +125,7 @@ func initOLDir(olPath string, dockerBaseImage string, newBase bool) (err error)`
`125`	`125`	`}`
`126`	`126`	`}`
`127`	`127`	`} else {`
`128`		`- // Directory exists but doesn't contain a valid OL deployment`
`129`		`- // Remove it and create a fresh one`
`130`		`- fmt.Printf("Directory %s exists but is not a valid OL deployment. Removing it.\n", olPath)`
`131`		`- if err := os.RemoveAll(olPath); err != nil {`
`132`		`- return fmt.Errorf("failed to remove invalid OL directory %s: %w", olPath, err)`
`133`		`- }`
	`128`	`+ return fmt.Errorf("Directory %s already exists but does not contain a previous OL deployment", olPath)`
`134`	`129`	`}`
`135`	`130`	`} else {`
`136`	`131`	`if err := os.Mkdir(olPath, 0700); err != nil {`