Merge pull request #21 from EchoVault/chore/fix-race-condition

Fixed race conditions in acl module tests

.github/workflows/go.yml

@@ -29,6 +29,9 @@ jobs:
     - name: Test
       run: go test -coverprofile=coverage.out -v ./...
 
+    - name: Test for Data Race
+      run: go test ./... --race
+
     - name: Upload coverage reports to Codecov
       uses: codecov/[email protected]
       with:

Makefile

@@ -9,3 +9,6 @@ run:
 
 test:
 	go clean -testcache && go test ./... -coverprofile coverage/coverage.out
+
+test-race:
+	go clean -testcache && go test ./... --race

README.md

@@ -6,6 +6,10 @@
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)
 <br/>
 [![Go Reference](https://pkg.go.dev/badge/github.com/echovault/echovault.svg)](https://pkg.go.dev/github.com/echovault/echovault)
+<br/>
+[![Discord](https://img.shields.io/discord/1211815152291414037?style=flat&label=Discord&color=%235865F2)
+](https://discord.gg/aasBFwDm)
+<br/>
 <hr/>
 
 <img alt="echovault_logo" src="./images/EchoVault GitHub Cover.png" width="5062" />

internal/clock/clock.go

@@ -32,7 +32,7 @@ func (RealClock) After(d time.Duration) <-chan time.Time {
 type MockClock struct{}
 
 func (MockClock) Now() time.Time {
-	t, _ := time.Parse(time.RFC3339, "2036-01-02T15:04:05+07:00")
+	t, _ := time.Parse(time.RFC3339, "2006-01-02T15:04:05+07:00")
 	return t
 }
 

pkg/modules/acl/commands_test.go

@@ -35,7 +35,7 @@ var mockServer *echovault.EchoVault
 
 func init() {
 	bindAddr = "localhost"
-	port = 7490
+	port = 7496
 
 	mockServer = setUpServer(bindAddr, port, true, "")
 
@@ -1019,7 +1019,7 @@ func Test_HandleSetUser(t *testing.T) {
 
 	for i, test := range tests {
 		if test.presetUser != nil {
-			acl.Users = append(acl.Users, test.presetUser)
+			acl.AddUsers([]*internal_acl.User{test.presetUser})
 		}
 		if err = r.WriteArray(test.cmd); err != nil {
 			t.Error(err)
@@ -1164,7 +1164,7 @@ func Test_HandleGetUser(t *testing.T) {
 
 	for _, test := range tests {
 		if test.presetUser != nil {
-			acl.Users = append(acl.Users, test.presetUser)
+			acl.AddUsers([]*internal_acl.User{test.presetUser})
 		}
 		if err = r.WriteArray(test.cmd); err != nil {
 			t.Error(err)
@@ -1261,7 +1261,7 @@ func Test_HandleDelUser(t *testing.T) {
 
 	for _, test := range tests {
 		if test.presetUser != nil {
-			acl.Users = append(acl.Users, test.presetUser)
+			acl.AddUsers([]*internal_acl.User{test.presetUser})
 		}
 		if err = r.WriteArray(test.cmd); err != nil {
 			t.Error(err)
@@ -1456,9 +1456,8 @@ func Test_HandleList(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		for _, user := range test.presetUsers {
-			acl.Users = append(acl.Users, user)
-		}
+		acl.AddUsers(test.presetUsers)
+
 		if err = r.WriteArray(test.cmd); err != nil {
 			t.Error(err)
 		}