Update the resource removal sequence

troydai · troydai · commit 29150dcd625d · 2018-05-04T15:17:56.000-07:00
Also:
1. Adopt py.test over nosetest
2. Cleanup some test code
diff --git a/.gitignore b/.gitignore
@@ -96,5 +96,7 @@ ENV/
 *.sln
 
 # PyCharm / IntelliJ IDEA
-.idea/workspace.xml
-.idea/tasks.xml
+.idea/
+
+# PyTest and its code coverage
+.pytest_cache/
diff --git a/.idea/azure-python-devtools.iml b/.idea/azure-python-devtools.iml
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,6 @@ python:
   - "3.4"
   - "3.5"
   - "3.6"
-  - "3.6-dev"
 install:
   - pip install -r requirements.txt
 script:
diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,7 @@
 codecov==2.0.9
-mock==2.0.0;python_version<="2.7"
-nose==1.3.7
-pylint==1.8.2
+mock==2.0.0
+pylint==1.8.4
+pytest==3.5.1
+pytest-cov==2.5.1
 
 -e .
diff --git a/scripts/ci.sh b/scripts/ci.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+pylint src/azure_devtools
+pytest src/azure_devtools/scenario_tests/tests --cov=./
diff --git a/setup.py b/setup.py
@@ -9,7 +9,7 @@
 from setuptools import setup
 
 
-VERSION = "0.5.5"
+VERSION = "1.0.0"
 
 
 CLASSIFIERS = [
diff --git a/src/azure_devtools/scenario_tests/preparers.py b/src/azure_devtools/scenario_tests/preparers.py
@@ -40,16 +40,17 @@ def _preparer_wrapper(test_class_instance, **kwargs):
                     resource_name,
                     **kwargs
                 )
-            test_class_instance.addCleanup(
-                lambda: self.remove_resource_with_record_override(resource_name, **kwargs)
-            )
 
             if parameter_update:
                 kwargs.update(parameter_update)
 
             trim_kwargs_from_test_function(fn, kwargs)
 
-            fn(test_class_instance, **kwargs)
+            try:
+                fn(test_class_instance, **kwargs)
+            finally:
+                # Russian Doll - the last declared resource to be deleted first.
+                self.remove_resource_with_record_override(resource_name, **kwargs)
 
         setattr(_preparer_wrapper, '__is_preparer', True)
         functools.update_wrapper(_preparer_wrapper, fn)
diff --git a/src/azure_devtools/scenario_tests/recording_processors.py b/src/azure_devtools/scenario_tests/recording_processors.py
@@ -5,6 +5,7 @@
 
 from .utilities import is_text_payload, is_json_payload
 
+
 class RecordingProcessor(object):
     def process_request(self, request):  # pylint: disable=no-self-use
         return request
@@ -136,6 +137,7 @@ def process_request(self, request):
 
 class DeploymentNameReplacer(RecordingProcessor):
     """Replace the random deployment name with a fixed mock name."""
+
     def process_request(self, request):
         import re
         request.uri = re.sub('/deployments/([^/?]+)', '/deployments/mock-deployment', request.uri)
@@ -144,6 +146,7 @@ def process_request(self, request):
 
 class AccessTokenReplacer(RecordingProcessor):
     """Replace the access token for service principal authentication in a response body."""
+
     def __init__(self, replacement='fake_token'):
         self._replacement = replacement
 
@@ -189,6 +192,7 @@ def process_response(self, response):
 
 class RequestUrlNormalizer(RecordingProcessor):
     """URL parsing fix to account for '//' vs '/' in different versions of python"""
+
     def process_request(self, request):
         import re
         request.uri = re.sub('(?<!:)//', '/', request.uri)
diff --git a/src/azure_devtools/scenario_tests/tests/test_config.py b/src/azure_devtools/scenario_tests/tests/test_config.py
@@ -12,9 +12,7 @@
 except ImportError:
     from unittest import mock
 
-
 from azure_devtools.scenario_tests.const import ENV_LIVE_TEST
-from azure_devtools.scenario_tests.config import TestConfig
 
 
 class TestScenarioConfig(unittest.TestCase):
@@ -27,10 +25,12 @@ def tearDown(self):
         os.remove(self.cfgfile)
 
     def test_env_var(self):
+        from azure_devtools.scenario_tests.config import TestConfig
         with mock.patch.dict('os.environ', {ENV_LIVE_TEST: 'yes'}):
             config = TestConfig()
         self.assertIs(config.record_mode, True)
 
     def test_config_file(self):
+        from azure_devtools.scenario_tests.config import TestConfig
         config = TestConfig(config_file=self.cfgfile)
         self.assertIs(config.record_mode, True)
diff --git a/src/azure_devtools/scenario_tests/tests/test_integration_test_base.py b/src/azure_devtools/scenario_tests/tests/test_integration_test_base.py
@@ -3,7 +3,7 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
 
-import os.path
+import os
 import unittest
 
 from azure_devtools.scenario_tests.base import IntegrationTestBase, LiveTest
diff --git a/src/azure_devtools/scenario_tests/tests/test_preparer_order.py b/src/azure_devtools/scenario_tests/tests/test_preparer_order.py
@@ -0,0 +1,38 @@
+# --------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# --------------------------------------------------------------------------------------------
+
+from unittest import TestCase
+from azure_devtools.scenario_tests.preparers import AbstractPreparer
+
+traces = []
+
+
+class _TestPreparer(AbstractPreparer):
+    def __init__(self, name):
+        super(_TestPreparer, self).__init__('test', 20)
+        self._name = name
+
+    def create_resource(self, name, **kwargs):
+        traces.append('create ' + self._name)
+        return {}
+
+    def remove_resource(self, name, **kwargs):
+        traces.append('remove ' + self._name)
+
+
+class _TestClassSample(TestCase):
+    @_TestPreparer('A')
+    @_TestPreparer('B')
+    def example_test(self):
+        pass
+
+
+def test_preparer_order():
+    _TestClassSample().example_test()
+    assert len(traces) == 4
+    assert traces[0] == 'create A'
+    assert traces[1] == 'create B'
+    assert traces[2] == 'remove B'
+    assert traces[3] == 'remove A'
diff --git a/src/azure_devtools/scenario_tests/tests/test_recording_processor.py b/src/azure_devtools/scenario_tests/tests/test_recording_processor.py
@@ -4,6 +4,7 @@
 # --------------------------------------------------------------------------------------------
 
 import json
+
 try:
     import unittest.mock as mock
 except ImportError:
@@ -117,7 +118,6 @@ def test_subscription_recording_processor_for_response(self):
             self.assertSequenceEqual(mock_response['headers']['azure-asyncoperation'],
                                      [asyncoperation_header_template.format(replaced_subscription_id)])
 
-
     def test_recording_processor_skip_body_on_unrecognized_content_type(self):
         location_header_template = 'https://graph.windows.net/{}/directoryObjects/' \
                                    'f604c53a-aa21-44d5-a41f-c1ef0b5304bd/Microsoft.DirectoryServices.Application'
