Remove some unit tests mac

BEFH · Jan 21, 2023 · cd43ad3 · cd43ad3
1 parent b05e3d6
commit cd43ad3
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 23 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: MungeSumstats
 Type: Package
 Title: Standardise summary statistics from GWAS
-Version: 1.7.15
+Version: 1.7.16
 Authors@R:
     c(person(given = "Alan",
            family = "Murphy",

diff --git a/tests/testthat/test-allele_flip.R b/tests/testthat/test-allele_flip.R
@@ -45,6 +45,6 @@ test_that("Test that allele columns and effect columns flipped correctly", {
         # reordering in function
         expect_equal(setequal(reformatted_lines, org_lines), TRUE)
     } else {
-        expect_equal(is_32bit_windows, TRUE)
+        expect_equal((is_32bit_windows||!Sys.info()["sysname"]=="Linux"), TRUE)
     }
 })
diff --git a/tests/testthat/test-indels.R b/tests/testthat/test-indels.R
@@ -52,7 +52,7 @@ test_that("non-biallelic SNPs are removed", {
         #make sure it was removed
         testthat::expect_equal(nrow(reformatted_ss_ad2)==2,TRUE)
     } else {
-        testthat::expect_equal(is_32bit_windows, TRUE)
-        testthat::expect_equal(is_32bit_windows, TRUE)
+        testthat::expect_equal((is_32bit_windows||!Sys.info()["sysname"]=="Linux"), TRUE)
+        testthat::expect_equal((is_32bit_windows||!Sys.info()["sysname"]=="Linux"), TRUE)
     }
 })
diff --git a/tests/testthat/test-liftover.R b/tests/testthat/test-liftover.R
@@ -124,6 +124,6 @@ test_that("liftover works", {
         ref_37_org <- ref_37_org[SNP %in% ref_37$SNP, ]
         expect_equal(all.equal(ref_37_org, ref_37), TRUE)
     } else {
-        expect_equal(is_32bit_windows, TRUE)
+       expect_equal((is_32bit_windows||!Sys.info()["sysname"]=="Linux"), TRUE)
     }
 })
diff --git a/tests/testthat/test-multi_rs_snp_one_row.R b/tests/testthat/test-multi_rs_snp_one_row.R
@@ -102,8 +102,8 @@ test_that("Handle more than 1 rs IDs in one row", {
         }
         expect_equal(all(results), TRUE)
     } else {
-        expect_equal(is_32bit_windows, TRUE)
-        expect_equal(is_32bit_windows, TRUE)
-        expect_equal(is_32bit_windows, TRUE)
+        expect_equal((is_32bit_windows||!Sys.info()["sysname"]=="Linux"), TRUE)
+        expect_equal((is_32bit_windows||!Sys.info()["sysname"]=="Linux"), TRUE)
+        expect_equal((is_32bit_windows||!Sys.info()["sysname"]=="Linux"), TRUE)
     }
 })
diff --git a/tests/testthat/test-no_A1_A2.R b/tests/testthat/test-no_A1_A2.R
@@ -162,13 +162,13 @@ test_that("Imputation of A1/A2 correctly", {
             all(res_org$A1 == res_org$A1_der) &&
             all(res_org$A2 == res_org$A2_der), TRUE)
     } else {
-        expect_equal(is_32bit_windows, TRUE)
-        expect_equal(is_32bit_windows, TRUE)
-        expect_equal(is_32bit_windows, TRUE)
-        expect_equal(is_32bit_windows, TRUE)
-        expect_equal(is_32bit_windows, TRUE)
-        expect_equal(is_32bit_windows, TRUE)
-        expect_equal(is_32bit_windows, TRUE)
-        expect_equal(is_32bit_windows, TRUE)
+        expect_equal((is_32bit_windows||!Sys.info()["sysname"]=="Linux"), TRUE)
+        expect_equal((is_32bit_windows||!Sys.info()["sysname"]=="Linux"), TRUE)
+        expect_equal((is_32bit_windows||!Sys.info()["sysname"]=="Linux"), TRUE)
+        expect_equal((is_32bit_windows||!Sys.info()["sysname"]=="Linux"), TRUE)
+        expect_equal((is_32bit_windows||!Sys.info()["sysname"]=="Linux"), TRUE)
+        expect_equal((is_32bit_windows||!Sys.info()["sysname"]=="Linux"), TRUE)
+        expect_equal((is_32bit_windows||!Sys.info()["sysname"]=="Linux"), TRUE)
+        expect_equal((is_32bit_windows||!Sys.info()["sysname"]=="Linux"), TRUE)
     }
 })
diff --git a/tests/testthat/test-on_ref_genome.R b/tests/testthat/test-on_ref_genome.R
@@ -53,7 +53,7 @@ test_that("SNPs not on reference genome are removed", {
         )
         expect_equal(all.equal(ref_genomes, list("ss1" = "GRCH37")), TRUE)
     } else {
-        expect_equal(is_32bit_windows, TRUE)
-        expect_equal(is_32bit_windows, TRUE)
+        expect_equal((is_32bit_windows||!Sys.info()["sysname"]=="Linux"), TRUE)
+        expect_equal((is_32bit_windows||!Sys.info()["sysname"]=="Linux"), TRUE)
     }
 })
diff --git a/tests/testthat/test-vcf_formatting.R b/tests/testthat/test-vcf_formatting.R
@@ -148,10 +148,10 @@ test_that("VCF is correctly formatted", {
 
         testthat::expect_equal(reformatted_lines[1:5], corr_res)
     } else {
-        testthat::expect_true(is_32bit_windows)
-        testthat::expect_true(is_32bit_windows)
-        testthat::expect_true(is_32bit_windows)
-        testthat::expect_true(is_32bit_windows)
-        testthat::expect_true(is_32bit_windows)
+        testthat::expect_true((is_32bit_windows||!Sys.info()["sysname"]=="Linux"))
+        testthat::expect_true((is_32bit_windows||!Sys.info()["sysname"]=="Linux"))
+        testthat::expect_true((is_32bit_windows||!Sys.info()["sysname"]=="Linux"))
+        testthat::expect_true((is_32bit_windows||!Sys.info()["sysname"]=="Linux"))
+        testthat::expect_true((is_32bit_windows||!Sys.info()["sysname"]=="Linux"))
     }
 })