From a3d9cfe3673d7faa62331c31ec068847ff7f08e4 Mon Sep 17 00:00:00 2001 From: Matt Doyle Date: Fri, 9 Dec 2022 05:15:40 -0800 Subject: [PATCH] Removing Glazier dependency on pyfakefs PiperOrigin-RevId: 494144853 --- docs/setup/README.md | 1 - glazier/autobuild_test.py | 7 ++----- requirements.txt | 1 - 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/docs/setup/README.md b/docs/setup/README.md index 5384e97..1a565bc 100644 --- a/docs/setup/README.md +++ b/docs/setup/README.md @@ -23,7 +23,6 @@ of their respective owners and not the Glazier developers. For tests: -* fakefs: https://pypi.python.org/pypi/pyfakefs * mock: https://pypi.python.org/pypi/mock ### Resources diff --git a/glazier/autobuild_test.py b/glazier/autobuild_test.py index 3656879..76be6f9 100755 --- a/glazier/autobuild_test.py +++ b/glazier/autobuild_test.py @@ -22,7 +22,6 @@ from glazier.lib import buildinfo from glazier.lib import test_utils from glazier.lib import title from glazier.lib import winpe -from pyfakefs import fake_filesystem from glazier.lib import errors @@ -34,8 +33,6 @@ class AutobuildTest(test_utils.GlazierTestCase): super(AutobuildTest, self).setUp() self.autobuild = autobuild.AutoBuild() autobuild.logging = logs.logging - self.filesystem = fake_filesystem.FakeFilesystem() - autobuild.os = fake_filesystem.FakeOsModule(self.filesystem) @mock.patch.object(winpe, 'check_winpe', autospec=True) def test_setup_task_list(self, mock_check_winpe): @@ -47,7 +44,7 @@ class AutobuildTest(test_utils.GlazierTestCase): self.assertEqual(self.autobuild._SetupTaskList(), tasklist) # WinPE - self.filesystem.create_file(autobuild.constants.WINPE_TASK_LIST) + self.patch_constant_file_path(autobuild.constants, 'WINPE_TASK_LIST') mock_check_winpe.return_value = True tasklist = autobuild.constants.WINPE_TASK_LIST self.assertEqual(self.autobuild._SetupTaskList(), tasklist) @@ -59,7 +56,7 @@ class AutobuildTest(test_utils.GlazierTestCase): @mock.patch.object(autobuild.terminator, 'log_and_exit', autospec=True) @mock.patch.object(autobuild, 'os', autospec=True) def test_setup_task_list_error(self, mock_os, mock_log_and_exit): - self.filesystem.create_file(autobuild.constants.SYS_TASK_LIST) + self.patch_constant_file_path(autobuild.constants, 'SYS_TASK_LIST') autobuild.FLAGS.preserve_tasks = False mock_os.remove.side_effect = OSError self.autobuild._SetupTaskList() diff --git a/requirements.txt b/requirements.txt index 0074c7e..4b2b450 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,6 @@ absl-py backoff mock ntplib -pyfakefs==4.7.0 PyYAML requests six