cmd/snap: fix some corner-case test setup weirdness #5627
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
In some cases, when running the tests in a particular way, some bits of the environment were not set up properly and tests would fail. In particular colour support was getting isatty for stdout wrong, as it was never mocked outside of the colour tests. And dbus tests were failing to unset the session bus env var. It's a mystery how these things sometimes worked :-) but this should fix it for good. I've also taken the opportunity to unify our isatty handling (at least within cmd/snap; there's still code in progress/ doing it separately).
bboozzoo
reviewed
Aug 10, 2018
testutil/dbustest.go
Outdated
| @@ -54,6 +54,7 @@ func (s *DBusTest) SetUpSuite(c *C) { | |||
| err := s.dbusDaemon.Start() | |||
| c.Assert(err, IsNil) | |||
| s.oldSessionBusEnv = os.Getenv("DBUS_SESSION_BUS_ADDRESS") | |||
| os.Unsetenv("DBUS_SESSION_BUS_ADDRESS") | |||
There was a problem hiding this comment.
Shouldn't we do:
os.Setenv("DBUS_SESSION_BUS_ADDRESS", fmt.Sprintf("unix:%s/user_bus_socket", s.tmpdir))
now?
There was a problem hiding this comment.
you'd think so, but it doesn't work
There was a problem hiding this comment.
It takes a while for the socket to appear, http://paste.ubuntu.com/p/mwvRRjjqzf/
bboozzoo
approved these changes
Aug 10, 2018
Codecov Report
@@ Coverage Diff @@
## master #5627 +/- ##
==========================================
+ Coverage 78.94% 78.94% +<.01%
==========================================
Files 520 520
Lines 39571 39577 +6
==========================================
+ Hits 31238 31243 +5
+ Misses 5790 5789 -1
- Partials 2543 2545 +2
Continue to review full report at Codecov.
|
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.
In some cases, when running the tests in a particular way, some bits
of the environment were not set up properly and tests would fail. In
particular colour support was getting isatty for stdout wrong, as it
was never mocked outside of the colour tests. And dbus tests were
failing to unset the session bus env var. It's a mystery how these
things sometimes worked :-) but this should fix it for good.
I've also taken the opportunity to unify our isatty handling (at least
within cmd/snap; there's still code in progress/ doing it separately).