Skip to content

Fix deepcopy and pickle support for AdbError and AdbTimeoutError #1022

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xpconanfan merged 1 commit into from
Aug 9, 2026
+52 −2
Merged

Fix deepcopy and pickle support for AdbError and AdbTimeoutError #1022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions mobly/controllers/android_device_lib/adb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class AdbError(Error):
"""

def __init__(self, cmd, stdout, stderr, ret_code, serial=''):
super().__init__()
super().__init__(cmd, stdout, stderr, ret_code, serial)
self.cmd = cmd
self.stdout = stdout
self.stderr = stderr
Expand Down Expand Up @@ -96,7 +96,7 @@ class AdbTimeoutError(Error):
"""

def __init__(self, cmd, timeout, serial=''):
super().__init__()
super().__init__(cmd, timeout, serial)
self.cmd = cmd
self.timeout = timeout
self.serial = serial
Expand Down
50 changes: 50 additions & 0 deletions tests/mobly/controllers/android_device_lib/adb_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
# limitations under the License.

import collections
import copy
import io
import pickle
import subprocess
import unittest
from unittest import mock
Expand Down Expand Up @@ -998,6 +1000,54 @@ def test_current_user_id_between_21_and_24(self, mock_exec_cmd, mock_getprop):
)
self.assertEqual(user_id, 123)

def test_adberror_deepcopy_and_pickle(self):
err = adb.AdbError(['adb', 'devices'], b'stdout', b'stderr', 1, 'serial123')
err_copy = copy.deepcopy(err)
self.assertIsNot(err, err_copy)
self.assertIsNot(err.cmd, err_copy.cmd)
self.assertEqual(err.cmd, err_copy.cmd)
self.assertEqual(err.stdout, err_copy.stdout)
self.assertEqual(err.stderr, err_copy.stderr)
self.assertEqual(err.ret_code, err_copy.ret_code)
self.assertEqual(err.serial, err_copy.serial)
self.assertEqual(str(err), str(err_copy))

# Validate deepcopy isolation by mutating the original list
err.cmd.append('--extra')
self.assertNotEqual(err.cmd, err_copy.cmd)

err_unpickled = pickle.loads(pickle.dumps(err_copy))
self.assertIsNot(err_copy, err_unpickled)
self.assertIsNot(err_copy.cmd, err_unpickled.cmd)
self.assertEqual(err_copy.cmd, err_unpickled.cmd)
self.assertEqual(err_copy.stdout, err_unpickled.stdout)
self.assertEqual(err_copy.stderr, err_unpickled.stderr)
self.assertEqual(err_copy.ret_code, err_unpickled.ret_code)
self.assertEqual(err_copy.serial, err_unpickled.serial)
self.assertEqual(str(err_copy), str(err_unpickled))

def test_adbtimeouterror_deepcopy_and_pickle(self):
err = adb.AdbTimeoutError(['adb', 'logcat'], 15.5, 'serial123')
err_copy = copy.deepcopy(err)
self.assertIsNot(err, err_copy)
self.assertIsNot(err.cmd, err_copy.cmd)
self.assertEqual(err.cmd, err_copy.cmd)
self.assertEqual(err.timeout, err_copy.timeout)
self.assertEqual(err.serial, err_copy.serial)
self.assertEqual(str(err), str(err_copy))

# Validate deepcopy isolation by mutating the original list
err.cmd.append('--extra')
self.assertNotEqual(err.cmd, err_copy.cmd)

err_unpickled = pickle.loads(pickle.dumps(err_copy))
self.assertIsNot(err_copy, err_unpickled)
self.assertIsNot(err_copy.cmd, err_unpickled.cmd)
self.assertEqual(err_copy.cmd, err_unpickled.cmd)
self.assertEqual(err_copy.timeout, err_unpickled.timeout)
self.assertEqual(err_copy.serial, err_unpickled.serial)
self.assertEqual(str(err_copy), str(err_unpickled))


if __name__ == '__main__':
unittest.main()
Loading