many: provide systemd.MockSystemctl() helper #3865
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pedronis
reviewed
Sep 6, 2017
daemon/api_test.go
Outdated
| @@ -87,6 +87,7 @@ type apiBaseSuite struct { | |||
| storeSigning *assertstest.StoreStack | |||
| restoreRelease func() | |||
| trustedRestorer func() | |||
| systemctlRestorer func() | |||
|
|
|||
| origSysctlCmd func(...string) ([]byte, error) | |||
There was a problem hiding this comment.
we don't need this anymore
daemon/api_test.go
Outdated
| @@ -87,6 +87,7 @@ type apiBaseSuite struct { | |||
| storeSigning *assertstest.StoreStack | |||
| restoreRelease func() | |||
| trustedRestorer func() | |||
| systemctlRestorer func() | |||
There was a problem hiding this comment.
would have a blank before this and group with the rest as orgiSysctlCmd before
| storeSigning *assertstest.StoreStack | ||
| restoreTrusted func() | ||
| restore func() | ||
| restoreSystemctl func() |
There was a problem hiding this comment.
we don't need prevctlCmd anymore and this should go there in its place
| } | ||
| } | ||
|
|
||
| func Available() error { |
Codecov Report
@@ Coverage Diff @@
## master #3865 +/- ##
=========================================
+ Coverage 75.9% 75.9% +<.01%
=========================================
Files 416 416
Lines 35988 35996 +8
=========================================
+ Hits 27315 27323 +8
Misses 6753 6753
Partials 1920 1920
Continue to review full report at Codecov.
|
zyga
approved these changes
Sep 11, 2017
| @@ -38,8 +38,7 @@ var ( | |||
| // ensureSupportInterface checks that the system has the core-support | |||
| // interface. An error is returned if this is not the case | |||
| func ensureSupportInterface() error { | |||
| _, err := systemd.SystemctlCmd("--version") | |||
| return err | |||
| return systemd.Available() | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This branch allows to MockSystemctl() in similar ways as we do for other snapd packages, i.e. to provide a restore helper.
A similar branch for systemd.JournalctlCmd() will follow if this one gets acceptance.