Issue #690: add test for hiding w/ groupA, notGroupA

TACC · Oct 5, 2024 · dcb5e81 · dcb5e81
1 parent 7b9a70a
commit dcb5e81
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 13 deletions.
diff --git a/rt/modulerc/err.txt b/rt/modulerc/err.txt
@@ -893,8 +893,9 @@ step 73
 lua ProjectDIR/src/lmod.in.lua shell --regression_testing avail
 ===========================
 ProjectDIR/rt/modulerc/mfD/Core
-   C/1.0    C/3.0 (F,D)    F/1.0 (NF)    cluster/a    cluster/c
-   C/2.0    D/3.0 (NF)     G/2.0         cluster/b    hard/1.0
+   C/1.0          D/3.0 (NF)    cluster/a    hard/1.0
+   C/2.0          F/1.0 (NF)    cluster/b    hard/3.0 (D)
+   C/3.0 (F,D)    G/2.0         cluster/c
   Where:
    D:   Default Module
    F:   Forbidden Module
@@ -909,10 +910,11 @@ step 74
 lua ProjectDIR/src/lmod.in.lua shell --regression_testing -A avail
 ===========================
 ProjectDIR/rt/modulerc/mfD/Core
-   C/1.0          F/1.0 (NF)    cluster/a                          hard/1.0
-   C/2.0          G/1.0 (H)     cluster/b
-   C/3.0 (F,D)    G/2.0 (D)     cluster/c
-   D/3.0 (NF)     H/1.0 (s)     cluster/.defaultCluster (H,F,D)
+   C/1.0          G/1.0     (H)    cluster/c
+   C/2.0          G/2.0     (D)    cluster/.defaultCluster (H,F,D)
+   C/3.0 (F,D)    H/1.0     (s)    hard/1.0
+   D/3.0 (NF)     cluster/a        hard/3.0                (D)
+   F/1.0 (NF)     cluster/b
   Where:
    D:   Default Module
    F:   Forbidden Module
@@ -949,6 +951,7 @@ cluster/c
 cluster/.defaultCluster <H> <F>
 hard/
 hard/1.0
+hard/3.0
 ===========================
 step 76
 lua ProjectDIR/src/lmod.in.lua shell --regression_testing load C
@@ -1037,7 +1040,7 @@ The following is a list of the modules and extensions currently available:
   F: F/1.0
   G: G/2.0
   cluster: cluster/a, cluster/b, cluster/c
-  hard: hard/1.0
+  hard: hard/1.0, hard/3.0
 To learn more about a package execute:
    $ module spider Foo
 where "Foo" is the name of a module.
@@ -1055,7 +1058,7 @@ The following is a list of the modules and extensions currently available:
   G: G/1.0, G/2.0
   H: H/1.0
   cluster: cluster/a, cluster/b, cluster/c, cluster/.defaultCluster
-  hard: hard/1.0
+  hard: hard/1.0, hard/3.0
 To learn more about a package execute:
    $ module spider Foo
 where "Foo" is the name of a module.
@@ -1082,6 +1085,7 @@ cluster/b
 cluster/c
 hard/
 hard/1.0
+hard/3.0
 ===========================
 step 86
 lua ProjectDIR/src/lmod.in.lua shell --regression_testing -t -A spider
@@ -1106,15 +1110,17 @@ cluster/c
 cluster/.defaultCluster <H> <F>
 hard/
 hard/1.0
+hard/3.0
 ===========================
 step 87
 lua ProjectDIR/src/lmod.in.lua shell --regression_testing -A avail
 ===========================
 ProjectDIR/rt/modulerc/mfD/Core
-   C/1.0           F/1.0 (NF)     cluster/a                          hard/1.0
-   C/2.0           G/1.0 (H)      cluster/b
-   C/3.0 (F,D)     G/2.0 (D)      cluster/c
-   D/3.0 (NF,L)    H/1.0 (s,L)    cluster/.defaultCluster (H,F,D)
+   C/1.0           G/1.0     (H)      cluster/c
+   C/2.0           G/2.0     (D)      cluster/.defaultCluster (H,F,D)
+   C/3.0 (F,D)     H/1.0     (s,L)    hard/1.0
+   D/3.0 (NF,L)    cluster/a          hard/3.0                (D)
+   F/1.0 (NF)      cluster/b
   Where:
    D:   Default Module
    F:   Forbidden Module

diff --git a/rt/modulerc/mfD/Core/hard/.modulerc.lua b/rt/modulerc/mfD/Core/hard/.modulerc.lua
@@ -1,2 +1,4 @@
 hide{name="hard/1.0",kind="hard",notUserA={"lmodTestUser"}}
 hide{name="hard/2.0",kind="hard",userA={   "lmodTestUser"}}
+hide{name="hard/3.0",kind="hard",notGroupA={"lmodTestGroup"}}
+hide{name="hard/4.0",kind="hard",groupA={   "lmodTestGroup"}}
diff --git a/rt/modulerc/mfD/Core/hard/3.0.lua b/rt/modulerc/mfD/Core/hard/3.0.lua
diff --git a/rt/modulerc/mfD/Core/hard/4.0.lua b/rt/modulerc/mfD/Core/hard/4.0.lua
diff --git a/rt/modulerc/out.txt b/rt/modulerc/out.txt
@@ -2211,6 +2211,22 @@ mrcMpathT = {
           lmodTestUser = true,
         },
       },
+      ["hard/3.0"] = {
+        action = "hide",
+        kind = "hard",
+        name = "hard/3.0",
+        notGroupT = {
+          lmodTestGroup = true,
+        },
+      },
+      ["hard/4.0"] = {
+        action = "hide",
+        groupT = {
+          lmodTestGroup = true,
+        },
+        kind = "hard",
+        name = "hard/4.0",
+      },
       hardAll = {
         action = "hide",
         kind = "hard",
@@ -2554,6 +2570,24 @@ spiderT = {
           pV = "000000002.*zfinal",
           wV = "000000002.*zfinal",
         },
+        ["hard/3.0"] = {
+          Version = "3.0",
+          canonical = "3.0",
+          fn = "ProjectDIR/rt/modulerc/mfD/Core/hard/3.0.lua",
+          luaExt = 4,
+          mpath = "ProjectDIR/rt/modulerc/mfD/Core",
+          pV = "000000003.*zfinal",
+          wV = "000000003.*zfinal",
+        },
+        ["hard/4.0"] = {
+          Version = "4.0",
+          canonical = "4.0",
+          fn = "ProjectDIR/rt/modulerc/mfD/Core/hard/4.0.lua",
+          luaExt = 4,
+          mpath = "ProjectDIR/rt/modulerc/mfD/Core",
+          pV = "000000004.*zfinal",
+          wV = "000000004.*zfinal",
+        },
       },
     },
     hardAll = {

diff --git a/src/myConfig.lua b/src/myConfig.lua
@@ -52,7 +52,6 @@ function myConfig(key)
          a[#a+1] =  "lmodTestGroup" 
       end
       result = a
-      end
    elseif (key == "shelltype") then
       result = Shell:name()
    end