Skip to content

Commit 1938326

Browse files
committed
properly isolate a test (#28385)
1 parent 45136b8 commit 1938326

File tree

1 file changed

+29
-27
lines changed

1 file changed

+29
-27
lines changed

stdlib/Pkg/test/repl.jl

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -249,34 +249,36 @@ end # cd
249249
end # temp_pkg_dir
250250

251251
# activate
252-
cd(mktempdir()) do
253-
path = pwd()
254-
pkg"activate ."
255-
mkdir("Foo")
256-
cd(mkdir("modules")) do
257-
pkg"generate Foo"
252+
temp_pkg_dir() do project_path
253+
cd(mktempdir()) do
254+
path = pwd()
255+
pkg"activate ."
256+
mkdir("Foo")
257+
cd(mkdir("modules")) do
258+
pkg"generate Foo"
259+
end
260+
pkg"develop modules/Foo"
261+
pkg"activate Foo" # activate path Foo over deps Foo
262+
@test Base.active_project() == joinpath(path, "Foo", "Project.toml")
263+
pkg"activate ."
264+
rm("Foo"; force=true, recursive=true)
265+
pkg"activate Foo" # activate path from developed Foo
266+
@test Base.active_project() == joinpath(path, "modules", "Foo", "Project.toml")
267+
pkg"activate ."
268+
pkg"activate ./Foo" # activate empty directory Foo (sidestep the developed Foo)
269+
@test Base.active_project() == joinpath(path, "Foo", "Project.toml")
270+
pkg"activate ."
271+
pkg"activate Bar" # activate empty directory Bar
272+
@test Base.active_project() == joinpath(path, "Bar", "Project.toml")
273+
pkg"activate ."
274+
pkg"add Example" # non-deved deps should not be activated
275+
pkg"activate Example"
276+
@test Base.active_project() == joinpath(path, "Example", "Project.toml")
277+
pkg"activate ."
278+
cd(mkdir("tests"))
279+
pkg"activate Foo" # activate developed Foo from another directory
280+
@test Base.active_project() == joinpath(path, "modules", "Foo", "Project.toml")
258281
end
259-
pkg"develop modules/Foo"
260-
pkg"activate Foo" # activate path Foo over deps Foo
261-
@test Base.active_project() == joinpath(path, "Foo", "Project.toml")
262-
pkg"activate ."
263-
rm("Foo"; force=true, recursive=true)
264-
pkg"activate Foo" # activate path from developed Foo
265-
@test Base.active_project() == joinpath(path, "modules", "Foo", "Project.toml")
266-
pkg"activate ."
267-
pkg"activate ./Foo" # activate empty directory Foo (sidestep the developed Foo)
268-
@test Base.active_project() == joinpath(path, "Foo", "Project.toml")
269-
pkg"activate ."
270-
pkg"activate Bar" # activate empty directory Bar
271-
@test Base.active_project() == joinpath(path, "Bar", "Project.toml")
272-
pkg"activate ."
273-
pkg"add Example" # non-deved deps should not be activated
274-
pkg"activate Example"
275-
@test Base.active_project() == joinpath(path, "Example", "Project.toml")
276-
pkg"activate ."
277-
cd(mkdir("tests"))
278-
pkg"activate Foo" # activate developed Foo from another directory
279-
@test Base.active_project() == joinpath(path, "modules", "Foo", "Project.toml")
280282
end
281283

282284
# test relative dev paths (#490)

0 commit comments

Comments
 (0)