Imported Debian patch 4.0.5-6~numeezy

ipatests/test_xmlrpc/test_batch_plugin.py

@@ -24,13 +24,10 @@ Test the `ipalib/plugins/batch.py` module.
 from ipalib import api, errors
 from ipatests.test_xmlrpc import objectclasses
 from ipatests.util import assert_equal, Fuzzy, assert_deepequal
-from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
-                                              fuzzy_uuid)
+from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
 from ipapython.dn import DN
-import pytest
 
 group1 = u'testgroup1'
-first1 = u'John'
 
 
 def deepequal_list(*expected):
@@ -49,7 +46,6 @@ def deepequal_list(*expected):
     return checker
 
 
-@pytest.mark.tier1
 class test_batch(Declarative):
 
     cleanup_commands = [
@@ -186,7 +182,7 @@ class test_batch(Declarative):
                 # missing required argument
                 dict(method='user_add', params=([], dict())),
                 # missing required option
-                dict(method='user_add', params=([], dict(givenname=first1))),
+                dict(method='group_add', params=([group1], dict())),
                 # bad type
                 dict(method='group_add', params=([group1], dict(
                         description=u't', gidnumber=u'bad'))),
@@ -220,7 +216,7 @@ class test_batch(Declarative):
                         error_code=3007,
                     ),
                     dict(
-                        error=u"'sn' is required",
+                        error=u"'description' is required",
                         error_name=u'RequirementError',
                         error_code=3007,
                     ),