bel
/
show-rss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cron/main_test uses proxy to read testdata/*.rss

main
Bel LaPointe 2025-04-27 13:17:02 -06:00
parent 49c44b9df8
commit 0628a678d8
4 changed files with 95 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/cmd/cron/main_test.go
View File

@ -1,10 +1,12 @@
package cron_test
import (
"bytes"
"context"
"fmt"
"io"
"net/http"
"net/http/httptest"
"os"
"show-rss/src/cmd/cron"
"show-rss/src/db"
"show-rss/src/feeds"
@ -24,29 +26,46 @@ func TestOne(t *testing.T) {
},
"feeds": func(t *testing.T) context.Context {
gets := []string{}
s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
gets = append(gets, r.URL.String())
t.Logf("%s", gets[len(gets)-1])
sURL := "http://192.168.0.167:10000/"
s := &http.Server{
Addr: ":10000",
Handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
gets = append(gets, r.URL.String())
t.Logf("serving fetch %s", gets[len(gets)-1])
switch r.URL.Query().Get("id") {
case "0":
case "1":
default:
http.NotFound(w, r)
}
}))
t.Cleanup(s.Close)
switch r.URL.Query().Get("idx") {
case "0":
case "1":
default:
http.NotFound(w, r)
}
b, _ := os.ReadFile(fmt.Sprintf("testdata/%s.rss", r.URL.Query().Get("idx")))
io.Copy(w, bytes.NewReader(b))
}),
}
go s.ListenAndServe()
t.Cleanup(func() { s.Close() })
t.Cleanup(func() {
slices.Sort(gets)
if len(gets) != 2+2+2 { // id=0+id=1 for each of 2 unrecycled ctx, id=0+id=1 for one across shared ctx
t.Errorf("didn't call urls exactly twice: %+v", gets)
if len(gets) != 1+2+2+2 { // healthcheck, id=0+id=1 for each of 2 unrecycled ctx, id=0+id=1 for one across shared ctx
t.Errorf("didn't call urls: %+v", gets)
}
})
for {
resp, err := http.Get(sURL)
if err == nil {
resp.Body.Close()
break
}
time.Sleep(100 * time.Millisecond)
}
ctx := db.Test(t, ctx)
for i := 0; i < 2; i++ {
if _, err := feeds.Insert(ctx, fmt.Sprintf("%s?idx=%d", s.URL, i), "* * * * *", "matches", "tag"); err != nil {
if _, err := feeds.Insert(ctx, fmt.Sprintf("%s?idx=%d", sURL, i), "* * * * *", "matches", "tag"); err != nil {
t.Fatal(err)
}
}

29
src/cmd/cron/testdata/0.rss vendored Normal file
View File

@ -0,0 +1,29 @@
<rdf:RDF>
<item>
<title>title matches</title>
<link>link</link>
<description>description</description>
<dc:date>2025-04-27T16:34:00+00:00</dc:date>
</item>
<item>
<title>title</title>
<link>link matches</link>
<description>description</description>
<dc:date>2025-04-27T16:34:00+00:00</dc:date>
</item>
<item>
<title>title</title>
<link>link</link>
<description>description matches</description>
<dc:date>2025-04-27T16:34:00+00:00</dc:date>
</item>
<item>
<title>title</title>
<link>link</link>
<description>description</description>
<dc:date>2025-04-27T16:34:00+00:00</dc:date>
</item>
</rdf:RDF>

30
src/cmd/cron/testdata/1.rss vendored Normal file
View File

@ -0,0 +1,30 @@
<rdf:RDF>
<item>
<title>1 title matches</title>
<link>1 link</link>
<description>1 description</description>
<dc:date>2025-04-27T16:34:00+00:00</dc:date>
</item>
<item>
<title>1 title</title>
<link>1 link matches</link>
<description>1 description</description>
<dc:date>2025-04-27T16:34:00+00:00</dc:date>
</item>
<item>
<title>1 title</title>
<link>1 link</link>
<description>1 description matches</description>
<dc:date>2025-04-27T16:34:00+00:00</dc:date>
</item>
<item>
<title>1 title</title>
<link>1 link</link>
<description>1 description</description>
<dc:date>2025-04-27T16:34:00+00:00</dc:date>
</item>
</rdf:RDF>

4
src/feeds/http.go
View File

@ -28,7 +28,7 @@ var (
)
func (feed Feed) ShouldExecute() (bool, error) {
if feed.Entry.Deleted.IsZero() {
if !feed.Entry.Deleted.IsZero() {
return false, nil
}
@ -45,7 +45,7 @@ func (feed Feed) ShouldExecute() (bool, error) {
return false, fmt.Errorf("illegal cron %q", feed.Version.Cron)
}
next := schedule.Next(feed.Execution.Executed)
return time.Now().Before(next), nil
return time.Now().After(next), nil
}
func (feed Feed) Fetch(ctx context.Context) (Items, error) {