commit e2c3d11a5d2d679ac92457e520b85c31056103dd
author Darin Petkov <petkov@chromium.org> Tue Apr 17 12:20:15 2012 +0200
committer Gerrit <chrome-bot@google.com> Tue Apr 17 07:39:01 2012 -0700
tree 8638a52041faaa2916439ec22dd677ed3da6752f
parent 2055098b0dc296b36a916fca9c2944c4cf3ca63e

shill: Use an empty environment for NSS cert lookup.

This ensures that the nss-get-cert script will use the correct NSS database
location.

BUG=chromium-os:29511
TEST=unit tests, tested on device that NSS lookup succeeds when running shill
with incorrect HOME

Change-Id: I246a65ba53d0476332e3a458680b114f8ea5a4e5
Reviewed-on: https://gerrit.chromium.org/gerrit/20368
Tested-by: Darin Petkov <petkov@chromium.org>
Reviewed-by: Paul Stewart <pstew@chromium.org>
Commit-Ready: Darin Petkov <petkov@chromium.org>

nss_unittest.cc

diff --git a/nss_unittest.cc b/nss_unittest.cc
index 57163f7..1bfb4ba 100644
--- a/nss_unittest.cc
+++ b/nss_unittest.cc
@@ -10,6 +10,7 @@
 
 using std::vector;
 using testing::_;
+using testing::NotNull;
 using testing::Return;
 using testing::SetArgumentPointee;
 
@@ -46,7 +47,8 @@
 
 TEST_F(NSSTest, GetCertfile) {
   EXPECT_CALL(glib_,
-              SpawnSync(_, GetCertfileArgv("pem"), _, _, _, _, _, _, _, _))
+              SpawnSync(_,
+                        GetCertfileArgv("pem"), NotNull(), _, _, _, _, _, _, _))
       .WillOnce(Return(false))
       .WillOnce(DoAll(SetArgumentPointee<8>(1), Return(true)))
       .WillOnce(DoAll(SetArgumentPointee<8>(0), Return(true)));