Fix flaky smoketest due to race condition in subscribe (#1656)

Co-authored-by: Zeke Foppa <bfops@users.noreply.github.com>

Author: coolreader18

smoketests/__init__.py

@@ -237,11 +237,17 @@ def stderr_task():
             sys.stderr.writelines(proc.stderr)
         threading.Thread(target=stderr_task).start()
 
-        init_update = proc.stdout.readline()
-        code = proc.poll()
-        if code:
-            raise subprocess.CalledProcessError(code, fake_args)
-        print("initial update:", init_update)
+        init_update = proc.stdout.readline().strip()
+        if init_update:
+            print("initial update:", init_update)
+        else:
+            try:
+                code = proc.wait()
+                if code:
+                    raise subprocess.CalledProcessError(code, fake_args)
+                print("no inital update, but no error code either")
+            except subprocess.TimeoutExpired:
+                print("no initial update, but process is still running")
 
         def run():
             updates = list(map(json.loads, proc.stdout))

smoketests/tests/add_remove_index.py

@@ -72,7 +72,7 @@ def test_add_then_remove_index(self):
         # There are no indices, resulting in an unsupported unindexed join.
         self.publish_module(name, clear = False)
         with self.assertRaises(Exception):
-            self.subscribe(self.JOIN_QUERY, n = 0)()
+            self.subscribe(self.JOIN_QUERY, n = 0)
 
         self.between_publishes()
 
@@ -91,4 +91,4 @@ def test_add_then_remove_index(self):
         self.write_module_code(self.MODULE_CODE)
         self.publish_module(name, clear = False)
         with self.assertRaises(Exception):
-            self.subscribe(self.JOIN_QUERY, n = 0)()
+            self.subscribe(self.JOIN_QUERY, n = 0)

smoketests/tests/permissions.py

@@ -118,7 +118,7 @@ def test_private_table(self):
             self.spacetime("sql", self.address, "select * from Secret")
 
         with self.assertRaises(Exception):
-            self.subscribe("SELECT * FROM Secret", n=0)()
+            self.subscribe("SELECT * FROM Secret", n=0)
 
         sub = self.subscribe("SELECT * FROM *", n=1)
         self.call("do_thing", anon=True)