timeouts are milliseconds in scanner tests

ajdavis · ajdavis · commit 0728630c0acf · 2015-07-19T22:00:51.000-04:00
diff --git a/tests/test-mongoc-async.c b/tests/test-mongoc-async.c
@@ -9,7 +9,7 @@
 #undef MONGOC_LOG_DOMAIN
 #define MONGOC_LOG_DOMAIN "async-test"
 
-#define TIMEOUT 10000
+#define TIMEOUT 10000  /* milliseconds */
 #define NSERVERS 10
 
 #define TRUST_DIR "tests/trust_dir"
@@ -126,7 +126,7 @@ test_ismaster_impl (bool with_ssl)
                         TIMEOUT);
    }
 
-   while (mongoc_async_run (async, TIMEOUT * 1000 * 10)) {
+   while (mongoc_async_run (async, TIMEOUT)) {
    }
 
    for (i = 0; i < NSERVERS; i++) {
diff --git a/tests/test-mongoc-topology-scanner.c b/tests/test-mongoc-topology-scanner.c
@@ -8,7 +8,7 @@
 #undef MONGOC_LOG_DOMAIN
 #define MONGOC_LOG_DOMAIN "topology-scanner-test"
 
-#define TIMEOUT 20000
+#define TIMEOUT 20000 /* milliseconds */
 #define NSERVERS 10
 
 #define TRUST_DIR "tests/trust_dir"

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`#undef MONGOC_LOG_DOMAIN`
`10`	`10`	`#define MONGOC_LOG_DOMAIN "async-test"`
`11`	`11`
`12`		`-#define TIMEOUT 10000`
	`12`	`+#define TIMEOUT 10000 /* milliseconds */`
`13`	`13`	`#define NSERVERS 10`
`14`	`14`
`15`	`15`	`#define TRUST_DIR "tests/trust_dir"`
`@@ -126,7 +126,7 @@ test_ismaster_impl (bool with_ssl)`
`126`	`126`	`TIMEOUT);`
`127`	`127`	`}`
`128`	`128`
`129`		`- while (mongoc_async_run (async, TIMEOUT * 1000 * 10)) {`
	`129`	`+ while (mongoc_async_run (async, TIMEOUT)) {`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`for (i = 0; i < NSERVERS; i++) {`