Updates for jenkins integration runner

Sudo-Kid · Sudo-Kid · commit 2d7c8ffb8466 · 2017-07-25T12:47:08.000-07:00
diff --git a/gitlab_tests/base.py b/gitlab_tests/base.py
@@ -10,7 +10,7 @@ class BaseTest(unittest.TestCase):
     @responses.activate
     def setUp(self):
         self.user = os.environ.get('gitlab_user', 'root')
-        self.password = os.environ.get('gitlab_password', '1WmA1a3ONs9F')
+        self.password = os.environ.get('gitlab_password', '5iveL!fe')
         self.host = os.environ.get('gitlab_host', 'http://localhost:10080')
         self.gitlab = Gitlab(host=self.host, verify_ssl=False)
         self.gitlab.host = self.host
diff --git a/integration_tests/base.py b/integration_tests/base.py
@@ -6,13 +6,16 @@
 
 
 def log_to_term(var_name, response):
-    print('\r\r{}: {}\r\r'.format(var_name, response))
+    try:
+        print('\r\r{}: {}\r\r'.format(var_name, response.keys()))
+    except:
+        print('\r\r{}: {}\r\r'.format(var_name, response))
 
 
 class BaseTest(TestCase):
     def setUp(self):
         self.user = os.environ.get('gitlab_user', 'root')
-        self.password = os.environ.get('gitlab_password', '1WmA1a3ONs9F')
+        self.password = os.environ.get('gitlab_password', '5iveL!fe')
         self.host = os.environ.get('gitlab_host', 'http://localhost:10080')
         self.gitlab = Gitlab(host=self.host, verify_ssl=False)
 
diff --git a/integration_tests/tests_v91/tests_users.py b/integration_tests/tests_v91/tests_users.py
@@ -1,18 +1,14 @@
 from integration_tests.base import BaseTest, log_to_term
+from response_data.users import *
 
 
 class TestGitlabV91(BaseTest):
     def test_add_remove_user(self):
         """Add and remove a user"""
-        response = self.gitlab.edituser(1, password='1WmA1a3ONs9F')
-        log_to_term('update_password:', response)
-        self.assertTrue(response)
-
         response = self.gitlab.createuser(
             'test', 'test', 'TestPassword1', 'test@example.com')
-        log_to_term('create_user', response)
+        self.assertEqual(post_users.keys(), response.keys())
 
         response = self.gitlab.delete_user(response['id'])
-        log_to_term('delete_user', response)
         self.assertTrue(isinstance(response, dict))
         self.assertEqual({}, response)
