Fix bug that clears account password on permission edit

[rbdr/mobius] / hotline / server_blackbox_test.go

diff --git a/hotline/server_blackbox_test.go b/hotline/server_blackbox_test.go
index 17ad7f49418779b40db14832e2ab15ef1277106d..138a17f285ca782e64c8c2c79811c893ef9789e4 100644 (file)
--- a/hotline/server_blackbox_test.go
+++ b/hotline/server_blackbox_test.go
@@ -1,6 +1,8 @@
 package hotline
 
 import (
+       "bytes"
+       "encoding/hex"
        "github.com/stretchr/testify/assert"
        "go.uber.org/zap"
        "go.uber.org/zap/zapcore"
@@ -25,19 +27,53 @@ func NewTestLogger() *zap.SugaredLogger {
        return l.Sugar()
 }
 
+// assertTransferBytesEqual takes a string with a hexdump in the same format that `hexdump -C` produces and compares with
+// a hexdump for the bytes in got, after stripping the create/modify timestamps.
+// I don't love this, but as git does not  preserve file create/modify timestamps, we either need to fully mock the
+// filesystem interactions or work around in this way.
+// TODO: figure out a better solution
+func assertTransferBytesEqual(t *testing.T, wantHexDump string, got []byte) bool {
+       if wantHexDump == "" {
+               return true
+       }
+
+       var clean []byte
+       clean = append(clean, got[:92]...)         // keep the first 92 bytes
+       clean = append(clean, make([]byte, 16)...) // replace the next 16 bytes for create/modify timestamps
+       clean = append(clean, got[108:]...)        // keep the rest
+
+       return assert.Equal(t, wantHexDump, hex.Dump(clean))
+}
+
 // tranAssertEqual compares equality of transactions slices after stripping out the random ID
 func tranAssertEqual(t *testing.T, tran1, tran2 []Transaction) bool {
        var newT1 []Transaction
        var newT2 []Transaction
+
        for _, trans := range tran1 {
                trans.ID = []byte{0, 0, 0, 0}
+               var fs []Field
+               for _, field := range trans.Fields {
+                       if bytes.Equal(field.ID, []byte{0x00, 0x6b}) {
+                               continue
+                       }
+                       fs = append(fs, field)
+               }
+               trans.Fields = fs
                newT1 = append(newT1, trans)
        }
 
        for _, trans := range tran2 {
                trans.ID = []byte{0, 0, 0, 0}
+               var fs []Field
+               for _, field := range trans.Fields {
+                       if bytes.Equal(field.ID, []byte{0x00, 0x6b}) {
+                               continue
+                       }
+                       fs = append(fs, field)
+               }
+               trans.Fields = fs
                newT2 = append(newT2, trans)
-
        }
 
        return assert.Equal(t, newT1, newT2)