disable more tests for pkg-build

bennn · bennn · commit a4b4462fb3f8 · 2020-07-18T21:37:39.000-04:00
diff --git a/ipoe/private/command/dbshell.rkt b/ipoe/private/command/dbshell.rkt
@@ -399,6 +399,8 @@
 (module+ test
   (require rackunit rackunit-abbrevs ipoe/private/util/check-print)
 
+  (define CI? (getenv "CI"))
+
   (test-case "arg-error"
     (check-equal?
       (arg-error 'FOO 'BAR 'BAZ)
@@ -433,7 +435,7 @@
   (define o* (options-init-for-test))
 
   (define-syntax-rule (with-db-test e)
-    (when o*
+    (when (and o* (not CI?))
       (parameterize-from-hash o* (lambda ()
         (parameterize ([*verbose* #t]
                        [*interactive?* #f]
diff --git a/ipoe/private/command/init.rkt b/ipoe/private/command/init.rkt
@@ -173,7 +173,7 @@
 (module+ test
   (require rackunit rackunit-abbrevs ipoe/private/util/check-print)
 
-  (define CI? (equal? "true" (getenv "CI")))
+  (define CI? (getenv "CI"))
 
   (test-case "get-username"
     (check-apply* (lambda (k1 k2)
@@ -216,10 +216,11 @@
       (void)))
 
   (test-case "psql-create-user, failure"
-    (check-exn #rx"ipoe:init"
-      (lambda ()
-        (check-print (list #rx"^Checking that user")
-          (lambda () (psql-create-user "FAKE-USER"))))))
+    (unless CI?
+      (check-exn #rx"ipoe:init"
+        (lambda ()
+          (check-print (list #rx"^Checking that user")
+            (lambda () (psql-create-user "FAKE-USER")))))))
 
   #;(test-case "psql-create-user, success"
     (parameterize-from-hash (options-init)
diff --git a/ipoe/private/db.rkt b/ipoe/private/db.rkt
@@ -814,12 +814,12 @@
 
   ;; -------------------------------------------------------------------
 
-  (define CI? (equal? "true" (getenv "CI")))
+  (define CI? (getenv "CI"))
 
   (define o* (options-init-for-test))
 
   (define-syntax-rule (with-db-test e)
-    (when o*
+    (when (and o* (not CI?))
       (parameterize-from-hash o* (lambda ()
         (parameterize ([*verbose* #t])
           (with-ipoe-db #:commit? #f
@@ -828,7 +828,7 @@
             (lambda () e)))))))
 
   (define-syntax-rule (with-online-test e)
-    (when o*
+    (when (and o* (not CI?))
       (parameterize-from-hash o* (lambda ()
        (parameterize ([*interactive?* #f])
         (with-ipoe-db #:commit? #f #:online-only? #t
diff --git a/ipoe/private/parameters.rkt b/ipoe/private/parameters.rkt
@@ -350,7 +350,7 @@
     (only-in racket/list last)
     (only-in racket/file file->lines))
 
-  (define CI? (equal? "true" (getenv "CI")))
+  (define CI? (getenv "CI"))
 
   (test-case "almost-option?"
     (check-true* almost-option?
@@ -422,16 +422,16 @@
       (check-equal? (options-get opt 'grammarcheck?) #f)))
 
   (test-case "options-set-from-file"
-  (define (gen-tmpfile fname)
-    (define s (symbol->string (gensym)))
-    (define full-path
-      (string-append (path->string (find-system-path 'temp-dir))
-                     "/"
-                     (or fname s)))
-
-    (if (file-exists? full-path)
-        (gen-tmpfile (string-append fname s))
-        full-path))
+    (define (gen-tmpfile fname)
+      (define s (symbol->string (gensym)))
+      (define full-path
+        (string-append (path->string (find-system-path 'temp-dir))
+                       "/"
+                       (or fname s)))
+
+      (if (file-exists? full-path)
+          (gen-tmpfile (string-append fname s))
+          full-path))
 
     (define-syntax-rule (refresh-file f str ...)
       (with-output-to-file f #:exists 'replace
diff --git a/ipoe/private/poem/form.rkt b/ipoe/private/poem/form.rkt
@@ -261,7 +261,7 @@
     (only-in racket/string string-split)
   )
 
-  (define CI? (equal? "true" (getenv "CI")))
+  (define CI? (getenv "CI"))
 
   ;; -- check-duplicate
   ;; Always void if first arg is #f
diff --git a/ipoe/private/poem/rhymecheck.rkt b/ipoe/private/poem/rhymecheck.rkt
@@ -295,8 +295,10 @@
 
   (define o* (options-init-for-test))
 
+  (define CI? (getenv "CI"))
+
   (define-syntax-rule (with-db-test e ...)
-    (when o*
+    (when (and o* (not CI?))
       (parameterize-from-hash o* (lambda ()
        (parameterize ([*interactive?* #f])
         (with-ipoe-db #:user (*user*)
diff --git a/ipoe/private/poem/spellcheck.rkt b/ipoe/private/poem/spellcheck.rkt
@@ -66,8 +66,10 @@
 
   (define o* (options-init-for-test))
 
+  (define CI? (getenv "CI"))
+
   (define-syntax-rule (with-db-test e)
-    (when o*
+    (when (and o* (not CI?))
       (parameterize-from-hash o*
         (lambda ()
          (parameterize ([*interactive?* #f])
diff --git a/ipoe/private/scrape/scrape-rhymes.rkt b/ipoe/private/scrape/scrape-rhymes.rkt
@@ -112,7 +112,7 @@
 (module+ test
   (require rackunit rackunit-abbrevs)
 
-  (define CI? (equal? "true" (getenv "CI")))
+  (define CI? (getenv "CI"))
 
   (test-case "rhyme?:almost-rhyme?"
     (when (not CI?)
diff --git a/ipoe/private/scrape/scrape-words.rkt b/ipoe/private/scrape/scrape-words.rkt
@@ -273,7 +273,7 @@
 
   (define not-a-word "hguwisdvzodxv")
 
-  (define CI? (equal? "true" (getenv "CI")))
+  (define CI? (getenv "CI"))
 
   (when (not CI?)
     (with-handlers ((exn:fail:network? (lambda (ex) (log-ipoe-scrape-warning "network error, skipping test"))))

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@`
`261`	`261`	`(only-in racket/string string-split)`
`262`	`262`	`)`
`263`	`263`
`264`		`- (define CI? (equal? "true" (getenv "CI")))`
	`264`	`+ (define CI? (getenv "CI"))`
`265`	`265`
`266`	`266`	`;; -- check-duplicate`
`267`	`267`	`;; Always void if first arg is #f`