Update tests for new environment handling

Signed-off-by: Joffrey F <joffrey@docker.com>

tests/integration/service_test.py

@@ -12,7 +12,6 @@ from six import StringIO
 from six import text_type
 
 from .. import mock
-from ..helpers import clear_environment
 from .testcases import DockerClientTestCase
 from .testcases import get_links
 from .testcases import pull_busybox
@@ -913,7 +912,7 @@ class ServiceTest(DockerClientTestCase):
         }.items():
             self.assertEqual(env[k], v)
 
-    @clear_environment
+    @mock.patch.dict(os.environ)
     def test_resolve_env(self):
         os.environ['FILE_DEF'] = 'E1'
         os.environ['FILE_DEF_EMPTY'] = 'E2'