Skip to content

Commit 5a589c3

Browse files
committed
Run Windows network tests as part of CI
We turned off because they were flakey on old infratstructure. Let's see if they are better now.
1 parent 294b6d1 commit 5a589c3

File tree

2 files changed

+21
-12
lines changed

2 files changed

+21
-12
lines changed

make.ps1

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -341,15 +341,15 @@ switch ($Command.ToLower())
341341
{
342342
if ($Uselldb -eq "yes")
343343
{
344-
Write-Output "$lldbcmd $lldbargs $outDir\stdlib-debug.exe --sequential --exclude=`"net/`""
345-
$lldboutput = & $lldbcmd $lldbargs $outDir\stdlib-debug.exe --sequential --exclude="net/"
344+
Write-Output "$lldbcmd $lldbargs $outDir\stdlib-debug.exe --sequential"
345+
$lldboutput = & $lldbcmd $lldbargs $outDir\stdlib-debug.exe --sequential
346346
Write-Output $lldboutput
347347
$err = ($lldboutput | Select-String -Pattern 'exited with status = (\S+)').Matches[0].Groups[1].Value
348348
}
349349
else
350350
{
351-
Write-Output "$outDir\stdlib-debug.exe --sequential --exclude=`"net/`""
352-
& $outDir\stdlib-debug.exe --sequential --exclude="net/"
351+
Write-Output "$outDir\stdlib-debug.exe --sequential"
352+
& $outDir\stdlib-debug.exe --sequential
353353
$err = $LastExitCode
354354
}
355355
}
@@ -377,15 +377,15 @@ switch ($Command.ToLower())
377377
{
378378
if ($Uselldb -eq "yes")
379379
{
380-
Write-Output "$lldbcmd $lldbargs $outDir\stdlib-release.exe --sequential --exclude=`"net/`""
381-
$lldboutput = & $lldbcmd $lldbargs $outDir\stdlib-release.exe --sequential --exclude="net/"
380+
Write-Output "$lldbcmd $lldbargs $outDir\stdlib-release.exe --sequential"
381+
$lldboutput = & $lldbcmd $lldbargs $outDir\stdlib-release.exe --sequential
382382
Write-Output $lldboutput
383383
$err = ($lldboutput | Select-String -Pattern 'exited with status = (\S+)').Matches[0].Groups[1].Value
384384
}
385385
else
386386
{
387-
Write-Output "$outDir\stdlib-release.exe --sequential --exclude=`"net/`""
388-
& $outDir\stdlib-release.exe --sequential --exclude="net/"
387+
Write-Output "$outDir\stdlib-release.exe --sequential"
388+
& $outDir\stdlib-release.exe --sequential
389389
$err = $LastExitCode
390390
}
391391
}

packages/net/_test.pony

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
use "files"
22
use "pony_test"
33

4+
primitive TimeoutValue
5+
fun apply(): U64 =>
6+
ifdef windows then
7+
// Windows networking is just damn slow at many things
8+
60_000_000_000
9+
else
10+
30_000_000_000
11+
end
12+
413
actor \nodoc\ Main is TestList
514
new create(env: Env) => PonyTest(env, this)
615
new make() => None
@@ -133,7 +142,7 @@ class \nodoc\ iso _TestBroadcast is UnitTest
133142
h.dispose_when_done(
134143
UDPSocket(UDPAuth(h.env.root), recover _TestPong(h) end))
135144

136-
h.long_test(30_000_000_000)
145+
h.long_test(TimeoutValue())
137146

138147
fun ref timed_out(h: TestHelper) =>
139148
h.log("""
@@ -167,7 +176,7 @@ class \nodoc\ _TestTCP is TCPListenNotify
167176
h.dispose_when_done(TCPListener(TCPListenAuth(h.env.root), consume this))
168177
h.complete_action("server create")
169178

170-
h.long_test(30_000_000_000)
179+
h.long_test(TimeoutValue())
171180

172181
fun ref not_listening(listen: TCPListener ref) =>
173182
_h.fail_action("server listen")
@@ -685,7 +694,7 @@ class \nodoc\ _TestTCPConnectionFailed is UnitTest
685694
end,
686695
host,
687696
port)
688-
h.long_test(30_000_000_000)
697+
h.long_test(TimeoutValue())
689698
h.dispose_when_done(connection)
690699

691700
class \nodoc\ _TestTCPConnectionToClosedServerFailed is UnitTest
@@ -731,7 +740,7 @@ class \nodoc\ _TestTCPConnectionToClosedServerFailed is UnitTest
731740
)
732741

733742
h.dispose_when_done(listener)
734-
h.long_test(30_000_000_000)
743+
h.long_test(TimeoutValue())
735744

736745
actor \nodoc\ _TCPConnectionToClosedServerFailedConnector
737746
be connect(h: TestHelper, host: String, port: String) =>

0 commit comments

Comments
 (0)