Skip to content

Commit a19ebb8

Browse files
committed
hostname: functionalize and add tests
1 parent 98b14cc commit a19ebb8

File tree

6 files changed

+20
-20
lines changed

6 files changed

+20
-20
lines changed

+stdlib/+dotnet/get_hostname.m

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
function n = get_hostname()
2+
3+
n = string(System.Environment.MachineName);
4+
% https://learn.microsoft.com/en-us/dotnet/api/system.environment.machinename
5+
6+
end

+stdlib/+java/get_hostname.m

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
function n = get_hostname()
2+
3+
n = string(javaMethod("getLocalHost", "java.net.InetAddress").getHostName());
4+
5+
end

+stdlib/+python/get_hostname.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
function n = get_hostname()
22

33
try
4-
n = char(py.socket.gethostname());
4+
n = string(py.socket.gethostname());
55
catch e
66
warning(e.identifier, "get_hostname failed: %s", e.message);
7-
n = '';
7+
n = string.empty;
88
end

+stdlib/hostname.m

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,15 @@
88
n = '';
99

1010
if stdlib.has_dotnet()
11-
n = System.Environment.MachineName;
12-
% https://learn.microsoft.com/en-us/dotnet/api/system.environment.machinename
11+
n = stdlib.dotnet.get_hostname();
1312
elseif stdlib.has_java()
14-
n = javaMethod("getLocalHost", "java.net.InetAddress").getHostName();
13+
n = stdlib.java.get_hostname();
1514
elseif stdlib.has_python()
1615
n = stdlib.python.get_hostname();
1716
elseif stdlib.isoctave()
1817
n = gethostname();
1918
end
2019

21-
try %#ok<*TRYNC>
22-
n = string(n);
23-
end
24-
2520
end
2621

2722
%!assert (!isempty(hostname()))

+stdlib/ram_total.m

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,11 @@
88

99
function bytes = ram_total()
1010

11-
bytes = 0;
12-
1311
if stdlib.dotnet_api() >= 6
1412
bytes = stdlib.dotnet.ram_total();
1513
elseif stdlib.has_java()
1614
bytes = stdlib.java.ram_total();
17-
end
18-
19-
if bytes <= 0
15+
else
2016
bytes = stdlib.sys.ram_total();
2117
end
2218

test/TestSys.m

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
fun = {stdlib.isoctave, stdlib.has_dotnet, ...
99
stdlib.has_java, stdlib.has_python}
1010
cpu_arch_fun = {@stdlib.cpu_arch, @stdlib.dotnet.cpu_arch, @stdlib.java.cpu_arch}
11+
host_fun = {@stdlib.hostname, @stdlib.dotnet.get_hostname, @stdlib.java.get_hostname, @stdlib.python.get_hostname}
1112
ram_free_fun = {@stdlib.ram_free, @stdlib.sys.ram_free, @stdlib.java.ram_free, @stdlib.python.ram_free}
1213
ram_total_fun = {@stdlib.ram_total, @stdlib.sys.ram_total, @stdlib.dotnet.ram_total @stdlib.java.ram_total}
1314
end
@@ -77,19 +78,16 @@ function test_cpu_count(tc)
7778
end
7879

7980
function test_checkRAM(tc)
80-
tc.assumeTrue(ispc() || stdlib.has_java())
81-
8281
tc.verifyClass(stdlib.checkRAM(1, "double"), "logical")
8382
end
8483

8584
function test_is_parallel(tc)
8685
tc.verifyClass(stdlib.is_parallel_worker(), 'logical')
8786
end
8887

89-
function test_hostname(tc)
90-
tc.assumeTrue(stdlib.has_dotnet() || stdlib.has_java() || stdlib.has_python())
91-
92-
h = stdlib.hostname();
88+
function test_hostname(tc, host_fun)
89+
is_capable(tc, host_fun)
90+
h = host_fun();
9391
tc.verifyGreaterThan(strlength(h), 0)
9492
end
9593

0 commit comments

Comments
 (0)