diff options
author | Ben Morrison <ben@gbmor.dev> | 2019-12-19 16:46:34 -0500 |
---|---|---|
committer | Ben Morrison <ben@gbmor.dev> | 2019-12-19 16:46:34 -0500 |
commit | 7db28dd705dd5463b5e2e9cf6f5fc87db25533ad (patch) | |
tree | fc6cf394405a36f36d0b50051b738f25a8605c54 /svc/db_test.go | |
parent | f60789a3bd40b61fb026af2f660bea3b2cc2ce46 (diff) | |
download | getwtxt-7db28dd705dd5463b5e2e9cf6f5fc87db25533ad.tar.gz |
decoupled tests from personal twtxt.txt
Rather than use my personal twtxt.txt file, I'm using the mocked twtxt.txt file I just added to the repository for test data. It is being fetched via https from github to avoid having to get rid of the url validity check in the associated registry library.
Diffstat (limited to 'svc/db_test.go')
-rw-r--r-- | svc/db_test.go | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/svc/db_test.go b/svc/db_test.go index f9ae26e..f54d610 100644 --- a/svc/db_test.go +++ b/svc/db_test.go @@ -30,17 +30,17 @@ func Test_pushpullDatabase(t *testing.T) { initTestConf() initTestDB() - out, _, err := registry.GetTwtxt("https://gbmor.dev/twtxt.txt", nil) + out, _, err := registry.GetTwtxt("https://github.com/getwtxt/getwtxt/raw/master/testdata/twtxt.txt", nil) if err != nil { t.Errorf("Couldn't set up test: %v\n", err) } - statusmap, err := registry.ParseUserTwtxt(out, "gbmor", "https://gbmor.dev/twtxt.txt") + statusmap, err := registry.ParseUserTwtxt(out, "getwtxttest", "https://github.com/getwtxt/getwtxt/raw/master/testdata/twtxt.txt") if err != nil { t.Errorf("Couldn't set up test: %v\n", err) } - twtxtCache.AddUser("gbmor", "https://gbmor.dev/twtxt.txt", net.ParseIP("127.0.0.1"), statusmap) + twtxtCache.AddUser("getwtxttest", "https://github.com/getwtxt/getwtxt/raw/master/testdata/twtxt.txt", net.ParseIP("127.0.0.1"), statusmap) remoteRegistries.List = append(remoteRegistries.List, "https://twtxt.tilde.institute/api/plain/users") @@ -52,7 +52,7 @@ func Test_pushpullDatabase(t *testing.T) { }) t.Run("Clearing Registry", func(t *testing.T) { - err := twtxtCache.DelUser("https://gbmor.dev/twtxt.txt") + err := twtxtCache.DelUser("https://github.com/getwtxt/getwtxt/raw/master/testdata/twtxt.txt") if err != nil { t.Errorf("%v", err) } @@ -62,7 +62,7 @@ func Test_pushpullDatabase(t *testing.T) { pullDB() twtxtCache.Mu.RLock() - if _, ok := twtxtCache.Users["https://gbmor.dev/twtxt.txt"]; !ok { + if _, ok := twtxtCache.Users["https://github.com/getwtxt/getwtxt/raw/master/testdata/twtxt.txt"]; !ok { t.Errorf("Missing user previously pushed to database\n") } twtxtCache.Mu.RUnlock() @@ -73,18 +73,18 @@ func Benchmark_pushDatabase(b *testing.B) { initTestConf() initTestDB() - if _, ok := twtxtCache.Users["https://gbmor.dev/twtxt.txt"]; !ok { - out, _, err := registry.GetTwtxt("https://gbmor.dev/twtxt.txt", nil) + if _, ok := twtxtCache.Users["https://github.com/getwtxt/getwtxt/raw/master/testdata/twtxt.txt"]; !ok { + out, _, err := registry.GetTwtxt("https://github.com/getwtxt/getwtxt/raw/master/testdata/twtxt.txt", nil) if err != nil { b.Errorf("Couldn't set up benchmark: %v\n", err) } - statusmap, err := registry.ParseUserTwtxt(out, "gbmor", "https://gbmor.dev/twtxt.txt") + statusmap, err := registry.ParseUserTwtxt(out, "getwtxttest", "https://github.com/getwtxt/getwtxt/raw/master/testdata/twtxt.txt") if err != nil { b.Errorf("Couldn't set up benchmark: %v\n", err) } - twtxtCache.AddUser("gbmor", "https://gbmor.dev/twtxt.txt", net.ParseIP("127.0.0.1"), statusmap) + twtxtCache.AddUser("getwtxttest", "https://github.com/getwtxt/getwtxt/raw/master/testdata/twtxt.txt", net.ParseIP("127.0.0.1"), statusmap) } b.ResetTimer() |