Skip to content

Commit

Permalink
Revert "Turn off DeterministicTrivial test (see #8356)"
Browse files Browse the repository at this point in the history
This reverts commit cd7a912.

It's not needed any more, probably, because another workaround
fixes CI differently, probably. As long as it's deterministic enough...
  • Loading branch information
Mikolaj committed Aug 16, 2022
1 parent 239dfd2 commit c68ed01
Showing 1 changed file with 3 additions and 8 deletions.
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
import Test.Cabal.Prelude
import qualified Data.ByteString as BS
-- import qualified Data.ByteString.Base16 as BS16
-- import qualified Crypto.Hash.SHA256 as SHA256
import qualified Data.ByteString.Base16 as BS16
import qualified Crypto.Hash.SHA256 as SHA256
import System.FilePath
( (</>) )

-- Note: we cannot simply use `expectBroken` or `skip` or similar
-- becuase this test fails on imports (see #8357).

main = cabalTest $ do
cabal "v2-sdist" ["deterministic"]
env <- getTestEnv
Expand All @@ -24,6 +21,4 @@ main = cabalTest $ do
known <- liftIO (BS.readFile knownSdist)
unknown <- liftIO (BS.readFile mySdist)

skipIf "#8356" True -- bogus, just to indicate that the test is skipped
assertEqual "hashes didn't match for sdist" True True
-- assertEqual "hashes didn't match for sdist" (BS16.encode $ SHA256.hash known) (BS16.encode $ SHA256.hash unknown)
assertEqual "hashes didn't match for sdist" (BS16.encode $ SHA256.hash known) (BS16.encode $ SHA256.hash unknown)

0 comments on commit c68ed01

Please sign in to comment.