test: Use falsy values for test environment variables

* In particular, a test environment set to an empty string
  should evaluate to false
* This falsyness will be needed for defaulting variables
  in the CI code.

Signed-off-by: Ferenc Géczi <[email protected]>

Author: Ferenc-

tests/__init__.py

@@ -6,7 +6,7 @@
 
 os.environ["INSTANA_TEST"] = "true"
 
-if 'GEVENT_TEST' in os.environ:
+if os.environ.get('GEVENT_TEST'):
     from gevent import monkey
     monkey.patch_all()
 

tests/apps/aiohttp_app/__init__.py

@@ -8,5 +8,7 @@
 
 APP_THREAD = None
 
-if 'GEVENT_TEST' not in os.environ and 'CASSANDRA_TEST' not in os.environ and sys.version_info >= (3, 5, 3):
+if not any((os.environ.get('GEVENT_TEST'),
+            os.environ.get('CASSANDRA_TEST'),
+            sys.version_info < (3, 5, 3))):
     APP_THREAD = launch_background_thread(server, "AIOHTTP")

tests/apps/flask_app/__init__.py

@@ -7,5 +7,5 @@
 
 app_thread = None
 
-if 'CASSANDRA_TEST' not in os.environ and app_thread is None:
+if not os.environ('CASSANDRA_TEST') and app_thread is None:
     app_thread = launch_background_thread(server.serve_forever, "Flask")

tests/apps/grpc_server/__init__.py

@@ -6,7 +6,9 @@
 import time
 import threading
 
-if 'GEVENT_TEST' not in os.environ and 'CASSANDRA_TEST' not in os.environ and sys.version_info >= (3, 5, 3):
+if not any((os.environ.get('GEVENT_TEST'),
+            os.environ.get('CASSANDRA_TEST'),
+            sys.version_info < (3, 5, 3))):
     # Background RPC application
     #
     # Spawn the background RPC app that the tests will throw
@@ -19,4 +21,4 @@
     rpc_server_thread.name = "Background RPC app"
     print("Starting background RPC app...")
     rpc_server_thread.start()
-    time.sleep(1)
+    time.sleep(1)

tests/apps/pyramid_app/__init__.py

@@ -7,5 +7,5 @@
 
 app_thread = None
 
-if 'CASSANDRA_TEST' not in os.environ:
+if not os.environ.get('CASSANDRA_TEST'):
     app_thread = launch_background_thread(server.serve_forever, "Pyramid")

tests/apps/tornado_server/__init__.py

@@ -8,7 +8,7 @@
 
 app_thread = None
 
-if app_thread is None and 'GEVENT_TEST' not in os.environ and 'CASSANDRA_TEST' not in os.environ:
+if not any((app_thread, os.environ.get('GEVENT_TEST'), os.environ.get('CASSANDRA_TEST')):
     testenv["tornado_port"] = 10813
     testenv["tornado_server"] = ("http://127.0.0.1:" + str(testenv["tornado_port"]))
 

tests/clients/test_cassandra-driver.py

@@ -31,7 +31,7 @@
                 ");")
 
 
-@pytest.mark.skipif("CASSANDRA_TEST" not in os.environ, reason="")
+@pytest.mark.skipif(not os.environ.get("CASSANDRA_TEST"), reason="")
 class TestCassandra(unittest.TestCase):
     def setUp(self):
         """ Clear all spans before a test run """

tests/clients/test_couchbase.py

@@ -29,7 +29,7 @@
     pass
 
 
-@pytest.mark.skipif("COUCHBASE_TEST" not in os.environ, reason="")
+@pytest.mark.skipif(not os.environ.get("COUCHBASE_TEST"), reason="")
 class TestStandardCouchDB(unittest.TestCase):
     def setup_class(self):
         """ Clear all spans before a test run """

tests/conftest.py

@@ -9,13 +9,13 @@
 
 # Cassandra and gevent tests are run in dedicated jobs on CircleCI and will
 # be run explicitly.  (So always exclude them here)
-if "CASSANDRA_TEST" not in os.environ:
+if not os.environ.get("CASSANDRA_TEST" ):
     collect_ignore_glob.append("*test_cassandra*")
 
-if "COUCHBASE_TEST" not in os.environ:
+if not os.environ.get("COUCHBASE_TEST"):
     collect_ignore_glob.append("*test_couchbase*")
 
-if "GEVENT_TEST" not in os.environ:
+if not os.environ.get("GEVENT_TEST"):
     collect_ignore_glob.append("*test_gevent*")
 
 # Python 3.10 support is incomplete yet

tests/frameworks/test_gevent.py

@@ -17,7 +17,7 @@
 from opentracing.scope_managers.gevent import GeventScopeManager
 
 
-@pytest.mark.skipif("GEVENT_TEST" not in os.environ, reason="")
+@pytest.mark.skipif(not os.environ.get("GEVENT_TEST"), reason="")
 class TestGEvent(unittest.TestCase):
     def setUp(self):
         self.http = urllib3.HTTPConnectionPool('127.0.0.1', port=testenv["wsgi_port"], maxsize=20)