Skip to content

Commit 8849d0b

Browse files
committed
fix test
- was removing other package, like nunit.console - was removing other package version (one was in use by dotnet test )
1 parent f99fca8 commit 8849d0b

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

integrationtests/Paket.IntegrationTests/LocalOverrideSpecs.fs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ open NUnit.Framework
1212

1313
[<Test>]
1414
let ``#1633 paket.local local source override``() =
15-
clearPackage "NUnit"
15+
clearPackageAtVersion "NUnit" "2.6.3"
1616

1717
paketEx true "restore" "i001633-local-source-override" |> ignore
1818
let doc = new XmlDocument()
@@ -31,14 +31,14 @@ let ``#1633 paket.local local source override``() =
3131
|> shouldEqual (Some "true")
3232

3333
// The package should not be in cache
34-
isPackageCached "NUnit"
34+
isPackageCached "NUnit" "2.6.3"
3535
|> shouldEqual []
3636

3737
// Issue #2690
3838
paketEx true "restore" "i001633-local-source-override" |> ignore
3939

4040
// The package should not be in cache
41-
isPackageCached "NUnit"
41+
isPackageCached "NUnit" "2.6.3"
4242
|> shouldEqual []
4343

4444
let replaceInFile filePath (searchText: string) replaceText =

integrationtests/Paket.IntegrationTests/TestHelper.fs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -254,25 +254,25 @@ let clearPackage name =
254254
|> Seq.filter (fun n -> Path.GetFileName n |> String.startsWithIgnoreCase name)
255255
|> Seq.iter (fun n -> File.Delete(n))
256256

257-
let isPackageCached name =
257+
let isPackageCached name version =
258258
// ~/.nuget/packages
259259
let userPackageFolder = Paket.Constants.UserNuGetPackagesFolder
260260

261261
// %APPDATA%/NuGet/Cache
262262
let nugetCache = Paket.Constants.NuGetCacheFolder
263263

264-
[ nugetCache; userPackageFolder ]
265-
|> List.collect (fun cacheDir ->
264+
[ for cacheDir in [ nugetCache; userPackageFolder ] do
266265
if Directory.Exists cacheDir then
267-
let dirs =
266+
yield!
268267
Directory.EnumerateDirectories(cacheDir)
269-
|> Seq.filter (fun n -> Path.GetFileName n |> String.startsWithIgnoreCase name)
270-
let files =
271-
Directory.EnumerateFiles(cacheDir)
272-
|> Seq.filter (fun n -> Path.GetFileName n |> String.startsWithIgnoreCase name)
273-
Seq.append dirs files
274-
|> Seq.toList
275-
else [])
268+
|> Seq.filter (fun n -> Path.GetFileName n |> String.equalsIgnoreCase name)
269+
|> Seq.collect (fun n -> Directory.EnumerateDirectories(n))
270+
|> Seq.filter (fun n -> Path.GetFileName n |> String.equalsIgnoreCase version)
271+
|> Seq.toList ]
272+
273+
let clearPackageAtVersion name version =
274+
isPackageCached name version
275+
|> List.iter (fun n -> Directory.Delete(n, true))
276276

277277
// Checks if a given package is present in cache ONLY with lowercase naming (see issue #2812)
278278
let isPackageCachedWithOnlyLowercaseNames (name: string) =

0 commit comments

Comments
 (0)