summary refs log tree commit diff stats
path: root/tests
diff options
context:
space:
mode:
authorDominik Picheta <dominikpicheta@googlemail.com>2017-11-22 14:43:10 +0000
committerAndreas Rumpf <rumpf_a@web.de>2017-11-22 15:43:10 +0100
commitd3394be5559c324da1c6b576d0ae9bfa966698d9 (patch)
tree72698b80e6045f35f783abe55405500b19808475 /tests
parent2c584cdb3d71f0cd811e3774c49db34735040032 (diff)
downloadNim-d3394be5559c324da1c6b576d0ae9bfa966698d9.tar.gz
Async upcoming (#6585)
* Merge upcoming async with current.
* Various improvements to selectors (mostly docs).

Two changes to highlight:

* Renamed ``setEvent`` to ``trigger``
* Reused setBlocking from nativesockets.
* Various changes/fixes to asyncdispatch after upcoming merge.
* Make some attempts to be compatible with older selectors.
* Reuse epoll module in ioselectors_epoll.
Diffstat (limited to 'tests')
-rw-r--r--tests/async/tioselectors.nim2
-rw-r--r--tests/testament/categories.nim1
2 files changed, 1 insertions, 2 deletions
diff --git a/tests/async/tioselectors.nim b/tests/async/tioselectors.nim
index 034c2185c..48043b4b5 100644
--- a/tests/async/tioselectors.nim
+++ b/tests/async/tioselectors.nim
@@ -2,7 +2,7 @@ discard """
   file: "tioselectors.nim"
   output: "All tests passed!"
 """
-import ioselectors
+import selectors
 
 const hasThreadSupport = compileOption("threads")
 
diff --git a/tests/testament/categories.nim b/tests/testament/categories.nim
index ca621969f..5468fc309 100644
--- a/tests/testament/categories.nim
+++ b/tests/testament/categories.nim
@@ -205,7 +205,6 @@ proc ioTests(r: var TResults, cat: Category, options: string) =
 proc asyncTests(r: var TResults, cat: Category, options: string) =
   template test(filename: untyped) =
     testSpec r, makeTest(filename, options, cat)
-    testSpec r, makeTest(filename, options & " -d:upcoming", cat)
   for t in os.walkFiles("tests/async/t*.nim"):
     test(t)