Remove VtsKernelCheckpointDTFstabTest and have VtsGsiBootTest to take over
The original py test case does not support the usage when there're
disabled dt-fstab nodes. This CL removes the py test and have
VtsGsiBootTest to take over because they share similar logics.
Bug:138449350
Test: run vts -m VtsKernelCheckpointTest on Pixel
Change-Id: I64d1e6f930657d419ab5bac863f0e0fbaf0be9dd
Merged-In: I64d1e6f930657d419ab5bac863f0e0fbaf0be9dd
diff --git a/checkpoint/Android.bp b/checkpoint/Android.bp
index 5d4c36f..2fdd165 100644
--- a/checkpoint/Android.bp
+++ b/checkpoint/Android.bp
@@ -17,7 +17,3 @@
vts_config {
name: "VtsKernelCheckpointTest",
}
-
-vts_config {
- name: "VtsKernelCheckpointDTFstabTest",
-}
diff --git a/checkpoint/AndroidTest.xml b/checkpoint/AndroidTest.xml
index 53c8daa..d66c0ea 100644
--- a/checkpoint/AndroidTest.xml
+++ b/checkpoint/AndroidTest.xml
@@ -20,11 +20,6 @@
<option name="cleanup" value="true" />
</target_preparer>
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsKernelCheckpointDTFstabTest" />
- <option name="test-case-path" value="vts/testcases/kernel/checkpoint/VtsKernelCheckpointDTFstabTest" />
- <option name="precondition-first-api-level" value="29" />
- </test>
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
<option name="test-module-name" value="VtsKernelCheckpointTest" />
<option name="test-case-path" value="vts/testcases/kernel/checkpoint/VtsKernelCheckpointTest" />
<option name="test-timeout" value="6m" />
diff --git a/checkpoint/VtsKernelCheckpointDTFstabTest.py b/checkpoint/VtsKernelCheckpointDTFstabTest.py
deleted file mode 100644
index 9c384bb..0000000
--- a/checkpoint/VtsKernelCheckpointDTFstabTest.py
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright (C) 2019 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.
-#
-
-"""A test to check if dynamic partitions is enabled for new devices in Q."""
-
-import logging
-
-from vts.runners.host import asserts
-from vts.runners.host import base_test
-from vts.runners.host import test_runner
-from vts.utils.python.file import target_file_utils
-
-
-class VtsKernelCheckpointDTFstabTest(base_test.BaseTestClass):
- """A test class to verify dynamic partitions are enabled."""
-
- def setUpClass(self):
- """Initializes device and shell."""
- self.dut = self.android_devices[0]
- self.shell = self.dut.shell
-
- def testMetadataEarlyMounted(self):
- """Checks metadata exists in device tree based fstab.
-
- Userdata checkpoint requires metadata to be early mounted.
- """
- fstab = "/proc/device-tree/firmware/android/fstab"
- if target_file_utils.Exists(fstab, self.shell):
- asserts.assertTrue(
- target_file_utils.Exists(fstab + "/metadata", self.shell),
- "No metadata found in fstab!")
- else:
- logging.info("device is not using device tree fstab")
-
-
-if __name__ == "__main__":
- test_runner.main()
