Merge "[WifiMacRandomizationTest]Fixed factory mac address of the softap interface of P21" into sc-dev am: 40e2e67ac9
Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/test/connectivity/+/15205966
Change-Id: Ifd70d767ecee587a81c1c1234eb37e7d1b44360a
diff --git a/acts_tests/acts_contrib/test_utils/tel/loggers/protos/telephony_stress_metric.proto b/acts_tests/acts_contrib/test_utils/tel/loggers/protos/telephony_stress_metric.proto
deleted file mode 100644
index 0a0b377..0000000
--- a/acts_tests/acts_contrib/test_utils/tel/loggers/protos/telephony_stress_metric.proto
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Note: If making any changes to this file be sure to generate a new
- compiled *_pb2.py file by running the following command from this
- directory:
- $ protoc -I=. --python_out=. telephony_stress_metric.proto
-
- Be sure that you are compiling with protoc 3.4.0
-
- More info can be found at:
- https://developers.google.com/protocol-buffers/docs/pythontutorial
-*/
-
-syntax = "proto2";
-
-package wireless.android.platform.testing.telephony.metrics;
-
-message TelephonyStressTestResult {
- map<string,int32> results_dict = 1;
-}
diff --git a/acts_tests/acts_contrib/test_utils/tel/loggers/protos/telephony_stress_metric_pb2.py b/acts_tests/acts_contrib/test_utils/tel/loggers/protos/telephony_stress_metric_pb2.py
deleted file mode 100644
index 6ccec95..0000000
--- a/acts_tests/acts_contrib/test_utils/tel/loggers/protos/telephony_stress_metric_pb2.py
+++ /dev/null
@@ -1,119 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by the protocol buffer compiler. DO NOT EDIT!
-# source: telephony_stress_metric.proto
-
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import message as _message
-from google.protobuf import reflection as _reflection
-from google.protobuf import symbol_database as _symbol_database
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-
-
-DESCRIPTOR = _descriptor.FileDescriptor(
- name='telephony_stress_metric.proto',
- package='wireless.android.platform.testing.telephony.metrics',
- syntax='proto2',
- serialized_options=None,
- create_key=_descriptor._internal_create_key,
- serialized_pb=b'\n\x1dtelephony_stress_metric.proto\x12\x33wireless.android.platform.testing.telephony.metrics\"\xc6\x01\n\x19TelephonyStressTestResult\x12u\n\x0cresults_dict\x18\x01 \x03(\x0b\x32_.wireless.android.platform.testing.telephony.metrics.TelephonyStressTestResult.ResultsDictEntry\x1a\x32\n\x10ResultsDictEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01'
-)
-
-
-
-
-_TELEPHONYSTRESSTESTRESULT_RESULTSDICTENTRY = _descriptor.Descriptor(
- name='ResultsDictEntry',
- full_name='wireless.android.platform.testing.telephony.metrics.TelephonyStressTestResult.ResultsDictEntry',
- filename=None,
- file=DESCRIPTOR,
- containing_type=None,
- create_key=_descriptor._internal_create_key,
- fields=[
- _descriptor.FieldDescriptor(
- name='key', full_name='wireless.android.platform.testing.telephony.metrics.TelephonyStressTestResult.ResultsDictEntry.key', index=0,
- number=1, type=9, cpp_type=9, label=1,
- has_default_value=False, default_value=b"".decode('utf-8'),
- message_type=None, enum_type=None, containing_type=None,
- is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
- _descriptor.FieldDescriptor(
- name='value', full_name='wireless.android.platform.testing.telephony.metrics.TelephonyStressTestResult.ResultsDictEntry.value', index=1,
- number=2, type=5, cpp_type=1, label=1,
- has_default_value=False, default_value=0,
- message_type=None, enum_type=None, containing_type=None,
- is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
- ],
- extensions=[
- ],
- nested_types=[],
- enum_types=[
- ],
- serialized_options=b'8\001',
- is_extendable=False,
- syntax='proto2',
- extension_ranges=[],
- oneofs=[
- ],
- serialized_start=235,
- serialized_end=285,
-)
-
-_TELEPHONYSTRESSTESTRESULT = _descriptor.Descriptor(
- name='TelephonyStressTestResult',
- full_name='wireless.android.platform.testing.telephony.metrics.TelephonyStressTestResult',
- filename=None,
- file=DESCRIPTOR,
- containing_type=None,
- create_key=_descriptor._internal_create_key,
- fields=[
- _descriptor.FieldDescriptor(
- name='results_dict', full_name='wireless.android.platform.testing.telephony.metrics.TelephonyStressTestResult.results_dict', index=0,
- number=1, type=11, cpp_type=10, label=3,
- has_default_value=False, default_value=[],
- message_type=None, enum_type=None, containing_type=None,
- is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
- ],
- extensions=[
- ],
- nested_types=[_TELEPHONYSTRESSTESTRESULT_RESULTSDICTENTRY, ],
- enum_types=[
- ],
- serialized_options=None,
- is_extendable=False,
- syntax='proto2',
- extension_ranges=[],
- oneofs=[
- ],
- serialized_start=87,
- serialized_end=285,
-)
-
-_TELEPHONYSTRESSTESTRESULT_RESULTSDICTENTRY.containing_type = _TELEPHONYSTRESSTESTRESULT
-_TELEPHONYSTRESSTESTRESULT.fields_by_name['results_dict'].message_type = _TELEPHONYSTRESSTESTRESULT_RESULTSDICTENTRY
-DESCRIPTOR.message_types_by_name['TelephonyStressTestResult'] = _TELEPHONYSTRESSTESTRESULT
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-
-TelephonyStressTestResult = _reflection.GeneratedProtocolMessageType('TelephonyStressTestResult', (_message.Message,), {
-
- 'ResultsDictEntry' : _reflection.GeneratedProtocolMessageType('ResultsDictEntry', (_message.Message,), {
- 'DESCRIPTOR' : _TELEPHONYSTRESSTESTRESULT_RESULTSDICTENTRY,
- '__module__' : 'telephony_stress_metric_pb2'
- # @@protoc_insertion_point(class_scope:wireless.android.platform.testing.telephony.metrics.TelephonyStressTestResult.ResultsDictEntry)
- })
- ,
- 'DESCRIPTOR' : _TELEPHONYSTRESSTESTRESULT,
- '__module__' : 'telephony_stress_metric_pb2'
- # @@protoc_insertion_point(class_scope:wireless.android.platform.testing.telephony.metrics.TelephonyStressTestResult)
- })
-_sym_db.RegisterMessage(TelephonyStressTestResult)
-_sym_db.RegisterMessage(TelephonyStressTestResult.ResultsDictEntry)
-
-
-_TELEPHONYSTRESSTESTRESULT_RESULTSDICTENTRY._options = None
-# @@protoc_insertion_point(module_scope)
diff --git a/acts_tests/acts_contrib/test_utils/tel/loggers/telephony_stress_metric_logger.py b/acts_tests/acts_contrib/test_utils/tel/loggers/telephony_stress_metric_logger.py
deleted file mode 100644
index 456e8b2..0000000
--- a/acts_tests/acts_contrib/test_utils/tel/loggers/telephony_stress_metric_logger.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# /usr/bin/env python3
-#
-# Copyright (C) 2021 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not
-# use this file except in compliance with the License. You may obtain a copy of
-# the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations under
-# the License.
-
-import base64
-import os
-import time
-
-from acts.metrics.core import ProtoMetric
-from acts.metrics.logger import MetricLogger
-from acts_contrib.test_utils.tel.loggers.protos.telephony_stress_metric_pb2 import TelephonyStressTestResult
-
-# Initializes the path to the protobuf
-PROTO_PATH = os.path.join(os.path.dirname(__file__),
- 'protos',
- 'telephony_stress_metric.proto')
-
-
-class TelephonyStressMetricLogger(MetricLogger):
- """A logger for gathering Telephony Stress test metrics
-
- Attributes:
- proto: Module used to store Telephony metrics in a proto
- """
-
- def __init__(self, event):
- super().__init__(event=event)
- self.proto = TelephonyStressTestResult()
-
- def set_result(self, result_dict):
- self.proto.results_dict = result_dict
-
- def end(self, event):
- metric = ProtoMetric(name='telephony_stress_test_result',
- data=self.proto)
- return self.publisher.publish(metric)
-
diff --git a/acts_tests/tests/google/tel/live/TelLiveStressTest.py b/acts_tests/tests/google/tel/live/TelLiveStressTest.py
index 80d3e7e..9351210 100644
--- a/acts_tests/tests/google/tel/live/TelLiveStressTest.py
+++ b/acts_tests/tests/google/tel/live/TelLiveStressTest.py
@@ -28,7 +28,6 @@
from acts.libs.proc import job
from acts.test_decorators import test_tracker_info
from acts_contrib.test_utils.tel.loggers.telephony_metric_logger import TelephonyMetricLogger
-from acts_contrib.test_utils.tel.loggers.telephony_stress_metric_logger import TelephonyStressMetricLogger
from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
from acts_contrib.test_utils.tel.tel_defines import CAPABILITY_VOLTE
from acts_contrib.test_utils.tel.tel_defines import CAPABILITY_WFC
@@ -110,19 +109,6 @@
EXCEPTION_TOLERANCE = 5
BINDER_LOGS = ["/sys/kernel/debug/binder"]
DEFAULT_FILE_DOWNLOADS = ["1MB", "5MB", "10MB", "20MB", "50MB"]
-RESULTS_LIST = {-2: "UNAVAILABLE_NETWORK_TYPE",
- -1: "CALL_SETUP_FAILURE",
- 0: "SUCCESS",
- 1: "INITIATE_FAILED",
- 2: "NO_RING_EVENT_OR_ANSWER_FAILED",
- 3: "NO_CALL_ID_FOUND",
- 4: "CALL_STATE_NOT_ACTIVE_DURING_ESTABLISHMENT",
- 5: "AUDIO_STATE_NOT_INCALL_DURING_ESTABLISHMENT",
- 6: "AUDIO_STATE_NOT_INCALL_AFTER_CONNECTED",
- 7: "CALL_DROP_OR_WRONG_STATE_DURING_ESTABLISHMENT",
- 8: "CALL_DROP_OR_WRONG_STATE_AFTER_CONNECTED",
- 9: "CALL_HANGUP_FAIL",
- 10: "CALL_ID_CLEANUP_FAIL"}
class TelLiveStressTest(TelephonyBaseTest):
@@ -805,7 +791,6 @@
self.log.error("Too many exception errors, quit test")
return False
self.log.info("%s", dict(self.result_info))
- self.tel_logger.set_result(self.result_collection)
if any([
self.result_info["Call Setup Failure"],
self.result_info["Call Maintenance Failure"],
