Imported Debian patch 4.0.5-6~numeezy

ipatests/test_ipaserver/test_changepw.py

@@ -18,38 +18,37 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import nose
-import ldap
-import pytest
 
-from ipatests.test_ipaserver.httptest import Unauthorized_HTTP_test
+from httptest import Unauthorized_HTTP_test
 from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test
 from ipatests.util import assert_equal, assert_not_equal
 from ipalib import api, errors
 from ipapython.dn import DN
+import ldap
 
 testuser = u'tuser'
 old_password = u'old_password'
 new_password = u'new_password'
 
-
-@pytest.mark.tier1
 class test_changepw(XMLRPC_test, Unauthorized_HTTP_test):
     app_uri = '/ipa/session/change_password'
 
-    def setup(self):
+    def setUp(self):
+        super(test_changepw, self).setUp()
         try:
             api.Command['user_add'](uid=testuser, givenname=u'Test', sn=u'User')
             api.Command['passwd'](testuser, password=u'old_password')
-        except errors.ExecutionError as e:
+        except errors.ExecutionError, e:
             raise nose.SkipTest(
                 'Cannot set up test user: %s' % e
             )
 
-    def teardown(self):
+    def tearDown(self):
         try:
             api.Command['user_del']([testuser])
         except errors.NotFound:
             pass
+        super(test_changepw, self).tearDown()
 
     def _changepw(self, user, old_password, new_password):
         return self.send_request(params={'user': str(user),