From 6a1e5f71be03e6dc9b3f5d4028bf0b2cb94897c5 Mon Sep 17 00:00:00 2001
From: bmccandless <bmccandless@chanzuckerberg.com>
Date: Thu, 29 Oct 2020 11:05:23 -0700
Subject: [PATCH] fix race condition in test_oauth (#1956)

---
 server/common/utils/type_conversion_utils.py |  6 +++---
 server/test/unit/auth/test_oauth.py          | 14 ++++++++------
 server/test/unit/cli/test_launch.py          |  1 -
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/server/common/utils/type_conversion_utils.py b/server/common/utils/type_conversion_utils.py
index 762dccb2..90ceabbb 100644
--- a/server/common/utils/type_conversion_utils.py
+++ b/server/common/utils/type_conversion_utils.py
@@ -129,9 +129,9 @@ def can_cast_to_int32(dtype, array_values=None):
             return True
         ii32 = np.iinfo(np.int32)
         if (
-                not ordered_array_values.empty
-                and (ordered_array_values.min() >= ii32.min and ordered_array_values.max() <= ii32.max)
-                or ordered_array_values.empty
+            not ordered_array_values.empty
+            and (ordered_array_values.min() >= ii32.min and ordered_array_values.max() <= ii32.max)
+            or ordered_array_values.empty
         ):
             return True
     return False
diff --git a/server/test/unit/auth/test_oauth.py b/server/test/unit/auth/test_oauth.py
index 43bdf1c2..b5214767 100644
--- a/server/test/unit/auth/test_oauth.py
+++ b/server/test/unit/auth/test_oauth.py
@@ -73,13 +73,15 @@ def launch_mock_oauth():
 
 
 class AuthTest(unittest.TestCase):
-    def setUp(self):
-        self.dataset_dataroot = FIXTURES_ROOT
-        self.mock_oauth_process = Process(target=launch_mock_oauth)
-        self.mock_oauth_process.start()
+    @classmethod
+    def setUpClass(cls):
+        cls.dataset_dataroot = FIXTURES_ROOT
+        cls.mock_oauth_process = Process(target=launch_mock_oauth)
+        cls.mock_oauth_process.start()
 
-    def tearDown(self):
-        self.mock_oauth_process.terminate()
+    @classmethod
+    def tearDownClass(cls):
+        cls.mock_oauth_process.terminate()
 
     def auth_flow(self, app_config, cookie_key=None):
 
diff --git a/server/test/unit/cli/test_launch.py b/server/test/unit/cli/test_launch.py
index 5569cfae..09906abe 100644
--- a/server/test/unit/cli/test_launch.py
+++ b/server/test/unit/cli/test_launch.py
@@ -20,7 +20,6 @@ class CLIPLaunchTests(unittest.TestCase):
     def tearDownClass(cls) -> None:
         shutil.rmtree(cls.tmp_dir)
 
-
     def test_dump_default_config(self):
         os.system(f"cellxgene launch --dump-default-config > {self.tmp_dir}/test_config_dump.txt")
         with open(f"{self.tmp_dir}/expected_config_dump.txt", "w") as expected_config: