reenables test

jmgomez · Feb 1, 2025 · b0f1a66 · b0f1a66
1 parent 862c107
commit b0f1a66
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 31 deletions.
diff --git a/src/nimblepkg/nimblesat.nim b/src/nimblepkg/nimblesat.nim
@@ -129,7 +129,7 @@ proc getMinimalInfo*(pkg: PackageInfo, options: Options): PackageMinimalInfo =
   result.name = if pkg.basicInfo.name.isNim: "nim" else: pkg.basicInfo.name
   result.version = pkg.basicInfo.version
   result.requires = pkg.requires.map(convertNimAliasToNim)
-  if options.action.typ in {actionLock, actionDeps} or options.hasNimInLockFile():
+  if options.action.typ in {actionDeps}:
     result.requires = result.requires.filterIt(not it.isNim)
   result.nimbleFile = some pkg.myPath
 
@@ -140,7 +140,7 @@ proc getMinimalInfo*(nimbleFile: string, pkgName: string, options: Options): Pac
   result.name = if pkgName.isNim: "nim" else: pkgName
   result.version = nimbleFileInfo.version.newVersion()
   result.requires = nimbleFileInfo.getRequires()
-  if options.action.typ in {actionLock, actionDeps} or options.hasNimInLockFile():
+  if options.action.typ in {actionDeps}:
     result.requires = result.requires.filterIt(not it.isNim)
   result.nimbleFile = some nimbleFile
 

diff --git a/tests/tlockfile.nim b/tests/tlockfile.nim
@@ -551,35 +551,35 @@ requires "nim >= 1.5.1"
         let (_, exitCode) = execNimbleYes("--debug", "--verbose", "sync")
         check exitCode == QuitSuccess
 
-  # test "can generate lock file for nim as dep":
-  #   cleanUp()
-  #   cd "nimdep":
-  #     removeFile "nimble.develop"
-  #     removeFile "nimble.lock"
-  #     # removeDir "Nim"
-
-  #     check execNimbleYes("-y", "develop", "nim").exitCode == QuitSuccess
-  #     cd "Nim":
-  #       let (_, exitCode) = execNimbleYes("-y", "install")
-  #       check exitCode == QuitSuccess
-
-  #     # check if the compiler version will be used when doing build
-      # testLockFile(@[("nim", "Nim")], isNew = true)
-  #     removeFile "nimble.develop"
-  #     removeDir "Nim"
-
-  #     let (output, exitCodeInstall) = execNimbleYes("-y", "build")
-  #     check exitCodeInstall == QuitSuccess
-  #     let usingNim = when defined(Windows): "nim.exe for compilation" else: "bin/nim for compilation"
-  #     check output.contains(usingNim)
-
-  #     # check the nim version
-  #     let (outputVersion, _) = execNimble("version")
-  #     check outputVersion.contains(getRevision("nim"))
-
-  #     let (outputGlobalNim, exitCodeGlobalNim) = execNimbleYes("-y", "--use-system-nim", "build")
-  #     check exitCodeGlobalNim == QuitSuccess
-  #     check not outputGlobalNim.contains(usingNim)
+  test "can generate lock file for nim as dep":
+    cleanUp()
+    cd "nimdep":
+      removeFile "nimble.develop"
+      removeFile "nimble.lock"
+      removeDir "Nim"
+
+      check execNimbleYes("-y", "develop", "nim").exitCode == QuitSuccess
+      cd "Nim":
+        let (_, exitCode) = execNimbleYes("-y", "install")
+        check exitCode == QuitSuccess
+
+      # check if the compiler version will be used when doing build
+      testLockFile(@[("nim", "Nim")], isNew = true)
+      removeFile "nimble.develop"
+      removeDir "Nim"
+
+      let (output, exitCodeInstall) = execNimbleYes("-y", "build")
+      check exitCodeInstall == QuitSuccess
+      let usingNim = when defined(Windows): "nim.exe for compilation" else: "bin/nim for compilation"
+      check output.contains(usingNim)
+
+      # check the nim version
+      let (outputVersion, _) = execNimble("version")
+      check outputVersion.contains(getRevision("nim"))
+
+      let (outputGlobalNim, exitCodeGlobalNim) = execNimbleYes("-y", "--use-system-nim", "build")
+      check exitCodeGlobalNim == QuitSuccess
+      check not outputGlobalNim.contains(usingNim)
 
   test "can install task level deps when dep has subdeb":
     cleanUp()