Skip to content

Commit e727b57

Browse files
author
KristofferC
committed
test preference merging in workspace
1 parent d7b5ec0 commit e727b57

File tree

5 files changed

+16
-0
lines changed

5 files changed

+16
-0
lines changed

test/loading.jl

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1554,6 +1554,10 @@ end
15541554
@testset "workspace loading" begin
15551555
old_load_path = copy(LOAD_PATH)
15561556
try
1557+
empty!(LOAD_PATH)
1558+
push!(LOAD_PATH, joinpath(@__DIR__, "project", "SubProject", "sub"))
1559+
@test Base.get_preferences()["value"] == 1
1560+
15571561
empty!(LOAD_PATH)
15581562
push!(LOAD_PATH, joinpath(@__DIR__, "project", "SubProject", "sub"))
15591563
id = Base.identify_package("Devved")
@@ -1572,6 +1576,7 @@ end
15721576
@test isfile(Base.locate_package(id_mypkg))
15731577
id_dev = Base.identify_package(id_mypkg, "Devved")
15741578
@test isfile(Base.locate_package(id_dev))
1579+
@test Base.get_preferences()["value"] == 2
15751580

15761581
empty!(LOAD_PATH)
15771582
push!(LOAD_PATH, joinpath(@__DIR__, "project", "SubProject", "PackageThatIsSub", "test"))
@@ -1584,6 +1589,7 @@ end
15841589
@test isfile(Base.locate_package(id_mypkg))
15851590
id_dev = Base.identify_package(id_mypkg, "Devved")
15861591
@test isfile(Base.locate_package(id_dev))
1592+
@test Base.get_preferences()["value"] == 3
15871593

15881594
empty!(LOAD_PATH)
15891595
push!(LOAD_PATH, joinpath(@__DIR__, "project", "SubProject", "test"))

test/project/SubProject/PackageThatIsSub/Project.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,6 @@ projects = ["test"]
88
[deps]
99
Devved2 = "08f74b90-50f5-462f-80b9-a72b1258a17b"
1010
MyPkg = "0cafdeb2-d7a2-40d0-8d22-4411fcc2c4ee"
11+
12+
[preferences]
13+
value = 2

test/project/SubProject/PackageThatIsSub/test/Project.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@
22
MyPkg = "0cafdeb2-d7a2-40d0-8d22-4411fcc2c4ee"
33
PackageThatIsSub = "1efb588c-9412-4e40-90a4-710420bd84aa"
44
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
5+
6+
[preferences]
7+
value = 3

test/project/SubProject/Project.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,6 @@ projects = ["sub", "PackageThatIsSub", "test"]
77
[deps]
88
Devved = "cbce3a6e-7a3d-4e84-8e6d-b87208df7599"
99
Devved2 = "08f74b90-50f5-462f-80b9-a72b1258a17b"
10+
11+
[preferences]
12+
value = 1
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
[deps]
22
Devved = "cbce3a6e-7a3d-4e84-8e6d-b87208df7599"
3+
MyPkg = "0cafdeb2-d7a2-40d0-8d22-4411fcc2c4ee"

0 commit comments

Comments
 (0)