summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorryantm <>2017-12-07 04:17:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2017-12-07 04:17:00 (GMT)
commit5207ac9917c06ac0ed08b946642d9c647f96cea9 (patch)
treeb1e18269d196db6f932e0c1e01fe624b78b8128d
parenta777bb8ded67bb3bb28475c23f47ade6c8ef30fa (diff)
version 2.0.0.1HEAD2.0.0.1master
-rw-r--r--heyefi.cabal2
-rw-r--r--test/HEyefi/UploadPhotoSpec.hs10
2 files changed, 6 insertions, 6 deletions
diff --git a/heyefi.cabal b/heyefi.cabal
index ff369a9..4a74282 100644
--- a/heyefi.cabal
+++ b/heyefi.cabal
@@ -3,7 +3,7 @@
-- see: https://github.com/sol/hpack
name: heyefi
-version: 2.0.0.0
+version: 2.0.0.1
synopsis: A server for Eye-Fi SD cards.
description: This server listens for Eye-Fi cards that want to upload files to a computer and stores them in an upload directory. It is meant to be run as a system daemon.
category: Network
diff --git a/test/HEyefi/UploadPhotoSpec.hs b/test/HEyefi/UploadPhotoSpec.hs
index 67c7805..69376a7 100644
--- a/test/HEyefi/UploadPhotoSpec.hs
+++ b/test/HEyefi/UploadPhotoSpec.hs
@@ -39,14 +39,14 @@ spec =
bs <- BS.readFile "test_upload_file.tar"
removeUploadDir
createDirectory uploadDir
- ge <- getGroupEntryForName "wheel"
- ue <- getUserEntryForName "ryantm"
- setOwnerAndGroup uploadDir (userID ue) (groupID ge)
+ gid <- getRealGroupID
+ uid <- getRealUserID
+ setOwnerAndGroup uploadDir uid gid
_ <- runWithConfig uploadConfig (writeTarFile bs)
contents <- getDirectoryContents uploadDir
length contents `shouldBe` 3
let f = "test_upload_dir/test_upload_file.txt"
fs <- getFileStatus f
- fileGroup fs `shouldBe` groupID ge
- fileOwner fs `shouldBe` userID ue
+ fileGroup fs `shouldBe` gid
+ fileOwner fs `shouldBe` uid
removeUploadDir))