Merge lp:~sil2100/cupstream2distro/quick_fix_for_typo into lp:cupstream2distro

Proposed by Łukasz Zemczak
Status: Merged
Approved by: Łukasz Zemczak
Approved revision: 754
Merged at revision: 754
Proposed branch: lp:~sil2100/cupstream2distro/quick_fix_for_typo
Merge into: lp:cupstream2distro
Diff against target: 25 lines (+2/-2)
2 files modified
cupstream2distro/silomanager.py (+1/-1)
tests/unit/test_silomanager.py (+1/-1)
To merge this branch: bzr merge lp:~sil2100/cupstream2distro/quick_fix_for_typo
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Timo Jyrinki Approve
Review via email: mp+235942@code.launchpad.net

Commit message

Fix a typo introduced by robru's changes that breaks the spreadsheet working - the '.' at the end of Packages built breaks many formulas and is unnecessary

Description of the change

Fix a typo introduced by robru's changes that breaks the spreadsheet working - the '.' at the end of Packages built breaks many formulas and is unnecessary

To post a comment you must log in.
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Yes, please.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:754
http://jenkins.qa.ubuntu.com/job/cu2d-choo-choo-ci/159/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/cu2d-choo-choo-ci/159/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'cupstream2distro/silomanager.py'
--- cupstream2distro/silomanager.py 2014-09-24 19:31:48 +0000
+++ cupstream2distro/silomanager.py 2014-09-25 11:39:04 +0000
@@ -128,7 +128,7 @@
128 return self.config_step == SILO_PUBLISHED128 return self.config_step == SILO_PUBLISHED
129129
130 def set_build_successful(self):130 def set_build_successful(self):
131 self.set_config_status(SILO_STATE_BUILD_SUCCESSFUL, 'Packages built.')131 self.set_config_status(SILO_STATE_BUILD_SUCCESSFUL, 'Packages built')
132132
133 def set_cleaning(self, message):133 def set_cleaning(self, message):
134 self.set_config_status(SILO_STATE_CLEANING, message)134 self.set_config_status(SILO_STATE_CLEANING, message)
135135
=== modified file 'tests/unit/test_silomanager.py'
--- tests/unit/test_silomanager.py 2014-09-24 19:31:48 +0000
+++ tests/unit/test_silomanager.py 2014-09-25 11:39:04 +0000
@@ -110,7 +110,7 @@
110 def test_silostate_status_setters(self):110 def test_silostate_status_setters(self):
111 setMock = self.state.set_config_status = Mock()111 setMock = self.state.set_config_status = Mock()
112 self.state.set_build_successful()112 self.state.set_build_successful()
113 setMock.assert_called_once_with(3, 'Packages built.')113 setMock.assert_called_once_with(3, 'Packages built')
114 self.state.set_cleaning('Foo')114 self.state.set_cleaning('Foo')
115 setMock.assert_called_with(11, 'Foo')115 setMock.assert_called_with(11, 'Foo')
116 self.state.set_merging()116 self.state.set_merging()

Subscribers

People subscribed via source and target branches