diff options
author | Barry Warsaw <barry@python.org> | 2015-01-22 20:52:01 -0500 |
---|---|---|
committer | Barry Warsaw <barry@python.org> | 2015-01-22 20:52:01 -0500 |
commit | 6f2a62c2fde85839ed437549597498a707f5da68 (patch) | |
tree | a21a6d5de345734de8e66d3d32bde73933399e25 /tests/unittests/test_runs | |
parent | c0aae445119252134e8c89b3b73999ed213135f1 (diff) | |
download | vyos-cloud-init-6f2a62c2fde85839ed437549597498a707f5da68.tar.gz vyos-cloud-init-6f2a62c2fde85839ed437549597498a707f5da68.zip |
Conversion from mocker to mock completed.
Diffstat (limited to 'tests/unittests/test_runs')
-rw-r--r-- | tests/unittests/test_runs/test_merge_run.py | 3 | ||||
-rw-r--r-- | tests/unittests/test_runs/test_simple_run.py | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/tests/unittests/test_runs/test_merge_run.py b/tests/unittests/test_runs/test_merge_run.py index 2d920eb8..d0ec36a9 100644 --- a/tests/unittests/test_runs/test_merge_run.py +++ b/tests/unittests/test_runs/test_merge_run.py @@ -4,14 +4,13 @@ import tempfile from .. import helpers -from cloudinit.settings import (PER_INSTANCE) +from cloudinit.settings import PER_INSTANCE from cloudinit import stages from cloudinit import util class TestMergeRun(helpers.FilesystemMockingTestCase): def _patchIn(self, root): - self.restore() self.patchOS(root) self.patchUtils(root) diff --git a/tests/unittests/test_runs/test_simple_run.py b/tests/unittests/test_runs/test_simple_run.py index 0279b8b0..e19e65cd 100644 --- a/tests/unittests/test_runs/test_simple_run.py +++ b/tests/unittests/test_runs/test_simple_run.py @@ -4,19 +4,17 @@ import tempfile from .. import helpers -from cloudinit.settings import (PER_INSTANCE) +from cloudinit.settings import PER_INSTANCE from cloudinit import stages from cloudinit import util class TestSimpleRun(helpers.FilesystemMockingTestCase): def _patchIn(self, root): - self.restore() self.patchOS(root) self.patchUtils(root) def _pp_root(self, root, repatch=True): - self.restore() for (dirpath, dirnames, filenames) in os.walk(root): print(dirpath) for f in filenames: |