Merge pull request #303 from adobe-apiplatform/v2

fix the nosetests.  Prep for GM release of 2.2.2.

Author: adobeDan

RELEASE_NOTES.md

@@ -1,6 +1,6 @@
 # Release Notes for User Sync Tool Version 2.2.2
 
-These notes apply to v2.2.2rc3 of 2017-11-14.
+These notes apply to v2.2.2 of 2017-11-19.
 
 ## New Features
 
@@ -24,10 +24,8 @@ There are no interface changes from prior versions.
 
 ## Known Issues
 
-The nosetests are broken in this release candidate.
-
-Because the release on Windows is built with a pre-compiled version of pyldap, we have to specify a specific version to be used in each release.  This may not always be the latest version.
+Because the release on Windows is built with a pre-compiled version of pyldap, we have to specify a specific version to be used in each release (see the setup.py file for the specific version).  This may not always be the latest version.
 
 On the Win64 platform, there are very long pathnames embedded in the released build artifact `user-sync.pex`, which will cause problems unless you are on Windows 10 and are either running Python 3.6 or have enabled long pathnames system-wide (as described in this [Microsoft Dev Center article](https://msdn.microsoft.com/en-us/library/windows/desktop/aa365247(v=vs.85).aspx)).  To work around this issue on older platforms, set the `PEX_ROOT` environment variable (as described [in the docs here](https://adobe-apiplatform.github.io/user-sync.py/en/user-manual/setup_and_installation.html)) to be a very short path (e.g., `set PEX_ROOT=C:\pex`).
 
-Each release on each platform is built with a specific version of Python.  Typically this is the latest available (from the OS vendor, if they provide one) for that platform.  In general, and especially on Windows, you should use the same Python to run User Sync as it was built with.
+Each release on each platform is built with a specific version of Python.  Typically this is the latest available for that platform (from the OS vendor, if they provide one, from [python.org](http://python.org) otherwise).  In general, and especially on Windows, you should use the same Python to run User Sync as it was built with.

tests/rules_test.py

@@ -78,8 +78,8 @@ def mock_load_users_and_groups(groups=None, extended_attributes=None, all_users=
         # when syncing, the existing Adobe user is processsed first
         user = everybody[1]
         commands = tests.helper.create_umapi_commands(user)
-        commands.add_groups(set([primary_group_21]))
         commands.remove_groups(set([primary_group_11]))
+        commands.add_groups(set([primary_group_21]))
         expected_primary_commands_list.append(commands)
         user = everybody[0]
         commands = tests.helper.create_umapi_commands(user)
@@ -190,22 +190,24 @@ def _do_country_code_test(self, mock_umapi_commands, mock_connectors, identity_t
         if (expected_country_code):
             expected_result['country'] = expected_country_code
 
-        options = {'default_country_code': default_country_code, 'new_account_type': identity_type}         
+        options = {'default_country_code': default_country_code, 'new_account_type': identity_type}
+        mock_info = user_sync.rules.UmapiTargetInfo('mock_primary')
         mock_rules = user_sync.rules.RuleProcessor(options)
+        mock_dir_user = {'username': '[email protected]',
+                         'domain': None, 'groups': ['CCE Group 1'],
+                         'firstname': '!Openldap CCE',
+                         'country': user_country_code,
+                         'lastname': 'User1',
+                         'identity_type': identity_type,
+                         'email': '[email protected]',
+                         'uid': '001'}
         mock_rules.directory_user_by_user_key = {
-            user_key: {'username': '[email protected]',
-                       'domain': None, 'groups': ['CCE Group 1'],
-                       'firstname': '!Openldap CCE',
-                       'country': user_country_code,
-                       'lastname': 'User1',
-                       'identity_type': identity_type,
-                       'email': '[email protected]',
-                       'uid': '001'}
+            user_key: mock_dir_user
         }
-        mock_rules.add_umapi_user(user_key, set(), mock_connectors)
+        mock_rules.create_umapi_user(user_key, set(), mock_info, mock_connectors)
 
         if (identity_type == 'federatedID' and default_country_code == None and user_country_code == None):
-            mock_rules.logger.error.assert_called_with('Federated user cannot be added without a specified country code: %s', user_key)
+            mock_rules.logger.error.assert_called_with('User cannot be added without a specified country code: %s', mock_dir_user)
         else:
             mock_umapi_commands.return_value.add_user.assert_called_with(expected_result)
 

user_sync/version.py

@@ -18,4 +18,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-__version__ = '2.2.2rc3'
+__version__ = '2.2.2'