Refactoring: metrics test and batches fixture.

Author: jimf5

tests/test_otel.py

@@ -144,8 +144,8 @@ def do_get(sock, path):
 
 @pytest.fixture
 def batches(spans, http_ver, otel_mode):
-    pos = 6 * http_ver + 3 * otel_mode
-    return spans[pos : pos + 3]
+    offset = 6 * http_ver + 3 * otel_mode
+    return spans[offset : offset + 3]
 
 
 @pytest.fixture
@@ -368,8 +368,7 @@ def test_span_name(self, http_ver, span, value, idx, otel_mode):
     def test_metrics(self, http_ver, span, idx, name, atype, value, otel_mode):
         if name in ["http.flavor", "http.user_agent"]:
             value = value[http_ver]
-        if type(value) is list:
-            value = value[idx]
+        value = value[idx] if type(value) is list else value
         if name == "net.sock.peer.port":
             assert span_attr(span, name, atype) in value
         else: