test:ram_* more robust

Author: scivision

test/TestSys.m

@@ -159,19 +159,27 @@ function test_cpu_arch(tc, cpu_arch_fun)
 end
 
 function test_ram_total(tc, ram_total_method)
-is_capable(tc, str2func("stdlib." + ram_total_method + ".ram_total"))
-
-t = stdlib.ram_total(ram_total_method);
+try
+  t = stdlib.ram_total(ram_total_method);
+catch e
+  tc.verifyEqual(e.identifier, 'stdlib:choose_method:NameError', e.message)
+  return
+end
+  
 tc.verifyGreaterThan(t, 0)
 tc.verifyClass(t, 'uint64')
 end
 
 
 function test_ram_free(tc, ram_free_method)
-% don't verify less than or equal total due to shaky system measurements
-is_capable(tc, str2func("stdlib." + ram_free_method + ".ram_free"))
+% don't verify less than or equal total due to shaky system measurements'
+try
+  f = stdlib.ram_free(ram_free_method);
+catch e
+  tc.verifyEqual(e.identifier, 'stdlib:choose_method:NameError', e.message)
+  return
+end
 
-f = stdlib.ram_free(ram_free_method);
 tc.verifyGreaterThan(f, 0)
 tc.verifyClass(f, 'uint64')
 end

test/is_capable.m

@@ -9,17 +9,12 @@ function is_capable(tc, f)
 if contains(n, ".dotnet.")
 
   dapi = stdlib.dotnet_api();
-
   tc.assumeGreaterThan(dapi, 0, ".NET not available")
 
   if endsWith(n, ["is_admin", "owner"])
     tc.assumeTrue(ispc(), "Windows only function")
   end
 
-  if endsWith(n, "ram_total")
-    tc.assumeGreaterThanOrEqual(dapi, 6);
-  end
-
 elseif contains(n, ".java.")
 
   japi = stdlib.java_api();
@@ -33,10 +28,6 @@ function is_capable(tc, f)
 
    tc.assumeTrue(stdlib.has_python(), "Python not available")
 
-   if endsWith(n, ["filesystem_type", "ram_free", "ram_total"])
-     tc.assumeTrue(stdlib.python.has_psutil(), "need Python psutil package")
-   end
-
    if endsWith(n, "owner")
      tc.assumeFalse(ispc(), "unix only function")
    end