From 6f2a62c2fde85839ed437549597498a707f5da68 Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Thu, 22 Jan 2015 20:52:01 -0500
Subject: Conversion from mocker to mock completed.

---
 tests/unittests/test_runs/test_merge_run.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'tests/unittests/test_runs/test_merge_run.py')

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)
 
-- 
cgit v1.2.3