Jenkins CI Agent Charm

Merge ~hloeung/jenkins-agent-charm:master into jenkins-agent-charm:master

  1. Git
  2. lp:~hloeung/jenkins-agent-charm
  3. master
  4. Merge into master
Proposed by Haw Loeung
Status: Merged
Approved by: Thomas Cuthbert
Approved revision: 574b7b760ddc1bc9c3ff8d8428f5df2ecbb5c2ef
Merged at revision: 2c53891e11d205e7e6b83fa7ae028fdba57f1b6b
Proposed branch: ~hloeung/jenkins-agent-charm:master
Merge into: jenkins-agent-charm:master
Diff against target: 15 lines (+2/-2)
1 file modified
tests/unit/test_jenkins_slave.py (+2/-2)
Reviewer Review Type Date Requested Status
Canonical IS Reviewers Pending
Jenkins CI Charmers Pending
Review via email: mp+374110@code.launchpad.net

Commit message

Fixed unit test

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 2c53891e11d205e7e6b83fa7ae028fdba57f1b6b

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/tests/unit/test_jenkins_slave.py b/tests/unit/test_jenkins_slave.py
2index 74943d8..860264a 100644
3--- a/tests/unit/test_jenkins_slave.py
4+++ b/tests/unit/test_jenkins_slave.py
5@@ -129,8 +129,8 @@ class TestSetDefaultConf(unittest.TestCase):
6 expected = [mock.call(home_dir='/var/lib/jenkins', system_user=True, username='jenkins')]
7 self.assertFalse(adduser.assert_has_calls(expected, any_order=True))
8 expected = [
9- mock.call('/var/lib/jenkins', group='jenkins', owner='jenkins'),
10- mock.call('/var/log/jenkins', group='jenkins', owner='jenkins'),
11+ mock.call('/var/lib/jenkins', group='jenkins', owner='jenkins', perms=0o755),
12+ mock.call('/var/log/jenkins', group='jenkins', owner='jenkins', perms=0o755),
13 ]
14 self.assertFalse(mkdir.assert_has_calls(expected, any_order=True))
15 self.assertFalse(service.assert_has_calls([mock.call('enable', 'jenkins-slave')], any_order=True))

Subscribers

People subscribed via source and target branches