Fix failing test and add test with auth

txels · Oct 4, 2012 · 4c91975 · 4c91975
1 parent cac9089
commit 4c91975
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/autojenkins/run.py b/autojenkins/run.py
@@ -41,7 +41,7 @@ def get_auth(options):
     """
     Return a tuple of (user, password) or None if no authentication
     """
-    if options.user:
+    if hasattr(options, 'user'):
         return (options.user, getattr(options, 'password', None))
     else:
         return None

diff --git a/autojenkins/tests/test_run.py b/autojenkins/tests/test_run.py
@@ -7,9 +7,23 @@
 @patch('autojenkins.run.Jenkins')
 def test_delete_jobs(jenkins):
     jenkins.return_value = Mock()
-    delete_jobs('http://jenkins', ['hello', 'bye'])
+    delete_jobs('http://jenkins', ['hello', 'bye'], None)
-    jenkins.assert_called_with('http://jenkins')
+    jenkins.assert_called_with('http://jenkins', auth=None)
     assert_equals(2, jenkins.return_value.delete.call_count)
     assert_equals(
             [(('hello',), {}), (('bye',), {})],
             jenkins.return_value.delete.call_args_list)
+
+
+@patch('autojenkins.run.Jenkins')
+def test_delete_jobs_authenticated(jenkins):
+    jenkins.return_value = Mock()
+    options = Mock()
+    options.user = 'carles'
+    options.password = 'secret'
+    delete_jobs('http://jenkins', ['hello'], options)
+    jenkins.assert_called_with('http://jenkins', auth=('carles', 'secret'))
+    assert_equals(1, jenkins.return_value.delete.call_count)
+    assert_equals(
+            [(('hello',), {})],
+            jenkins.return_value.delete.call_args_list)