pinning: cleanup tests

Signed-off-by: Sander Pick <sanderpick@gmail.com>

Author: sanderpick

gateway/gateway.go

@@ -450,6 +450,8 @@ func detectReaderOrPathContentType(r io.Reader, pth string) (string, io.Reader,
 		return "text/css", reader, nil
 	case ".js":
 		return "application/javascript", reader, nil
+	case ".txt", ".md":
+		return "text/plain", reader, nil
 	default:
 		return http.DetectContentType(buf[:]), reader, nil
 	}

pinning/queue/queue.go

@@ -298,6 +298,7 @@ func (q *Queue) RemoveRequest(key, id string) error {
 func (q *Queue) enqueue(r Request, isNew bool) error {
 	// Block while the request is placed in a queue
 	if isNew {
+		r.Status = openapi.PINNING
 		val, err := encode(r)
 		if err != nil {
 			return fmt.Errorf("encoding request: %v", err)
@@ -440,6 +441,15 @@ func (q *Queue) moveRequest(r Request, from, to openapi.Status) error {
 	if err != nil {
 		return fmt.Errorf("getting status key: %v", err)
 	}
+	r, err = decode(val)
+	if err != nil {
+		return fmt.Errorf("decoding status key: %v", err)
+	}
+	r.Status = to
+	val, err = encode(r)
+	if err != nil {
+		return fmt.Errorf("encoding status key: %v", err)
+	}
 
 	// Delete from global queue
 	if from == openapi.QUEUED {

pinning/queue/queue_test.go

@@ -59,22 +59,22 @@ func TestQueue_ListRequests(t *testing.T) {
 	l, err = q.ListRequests(key, Query{})
 	require.NoError(t, err)
 	assert.Len(t, l, 10)
-	assert.Equal(t, ids[0], l[0].ID)
-	assert.Equal(t, ids[9], l[9].ID)
+	assert.Equal(t, ids[0], l[0].Requestid)
+	assert.Equal(t, ids[9], l[9].Requestid)
 
 	// Get next page, should return next 10 older records
-	l, err = q.ListRequests(key, Query{After: l[len(l)-1].ID})
+	l, err = q.ListRequests(key, Query{After: l[len(l)-1].Requestid})
 	require.NoError(t, err)
 	assert.Len(t, l, 10)
-	assert.Equal(t, ids[10], l[0].ID)
-	assert.Equal(t, ids[19], l[9].ID)
+	assert.Equal(t, ids[10], l[0].Requestid)
+	assert.Equal(t, ids[19], l[9].Requestid)
 
 	// Get previous page, should return the first page in reverse order
-	l, err = q.ListRequests(key, Query{Before: l[0].ID})
+	l, err = q.ListRequests(key, Query{Before: l[0].Requestid})
 	require.NoError(t, err)
 	assert.Len(t, l, 10)
-	assert.Equal(t, ids[0], l[9].ID)
-	assert.Equal(t, ids[9], l[0].ID)
+	assert.Equal(t, ids[0], l[9].Requestid)
+	assert.Equal(t, ids[9], l[0].Requestid)
 
 	// Create more request with multiple statuses
 	now = time.Now()
@@ -105,22 +105,22 @@ func TestQueue_ListRequests(t *testing.T) {
 	require.NoError(t, err)
 	assert.Len(t, l, 10)
 	for i := 0; i < len(l); i++ {
-		assert.Equal(t, ids[i], l[i].ID)
+		assert.Equal(t, ids[i], l[i].Requestid)
 	}
 
 	// List only "pinned" statuses
 	l, err = q.ListRequests(key, Query{Status: []openapi.Status{openapi.PINNED}})
 	require.NoError(t, err)
 	assert.Len(t, l, 10)
-	assert.Equal(t, sids[0], l[0].ID)
-	assert.Equal(t, sids[9], l[9].ID)
+	assert.Equal(t, sids[0], l[0].Requestid)
+	assert.Equal(t, sids[9], l[9].Requestid)
 
 	// List only "failed" statuses
 	l, err = q.ListRequests(key, Query{Status: []openapi.Status{openapi.FAILED}})
 	require.NoError(t, err)
 	assert.Len(t, l, 10)
-	assert.Equal(t, fids[0], l[0].ID)
-	assert.Equal(t, fids[9], l[9].ID)
+	assert.Equal(t, fids[0], l[0].Requestid)
+	assert.Equal(t, fids[9], l[9].Requestid)
 }
 
 func TestQueue_AddRequest(t *testing.T) {
@@ -130,8 +130,8 @@ func TestQueue_AddRequest(t *testing.T) {
 	err := q.AddRequest(r)
 	require.NoError(t, err)
 
-	time.Sleep(time.Millisecond * 5)
-	s, err := q.GetRequest(r.Key, r.ID)
+	time.Sleep(time.Millisecond * 10)
+	s, err := q.GetRequest(r.Key, r.Requestid)
 	require.NoError(t, err)
 	assert.Equal(t, openapi.PINNED, s.Status)
 }
@@ -143,11 +143,11 @@ func TestQueue_RemoveRequest(t *testing.T) {
 	err := q.AddRequest(r)
 	require.NoError(t, err)
 
-	time.Sleep(time.Millisecond * 5)
-	err = q.RemoveRequest(r.Key, r.ID)
+	time.Sleep(time.Millisecond * 10)
+	err = q.RemoveRequest(r.Key, r.Requestid)
 	require.NoError(t, err)
 
-	_, err = q.GetRequest(r.Key, r.ID)
+	_, err = q.GetRequest(r.Key, r.Requestid)
 	require.Error(t, err)
 }
 
@@ -170,7 +170,7 @@ func TestQueueProcessing(t *testing.T) {
 		require.NoError(t, err)
 	}
 
-	time.Sleep(time.Millisecond * 5) // wait for all to arrive in a queue, but before any jobs complete
+	time.Sleep(time.Millisecond * 10) // wait for all to arrive in a queue, but before any jobs complete
 
 	l, err := q.ListRequests(key1, Query{
 		Status: []openapi.Status{openapi.PINNING},
@@ -224,7 +224,7 @@ func newQueue(t *testing.T) *Queue {
 }
 
 func handler(_ context.Context, r Request) error {
-	d, t := parseOutcome(r.Cid)
+	d, t := parseOutcome(r.Pin.Cid)
 	time.Sleep(d)
 	if t == succeed {
 		return nil
@@ -252,9 +252,13 @@ func parseOutcome(o string) (time.Duration, outcomeType) {
 
 func newRequest(k string, i string, d time.Duration, o outcomeType) Request {
 	return Request{
-		ID:  i,
+		PinStatus: openapi.PinStatus{
+			Requestid: i,
+			Pin: openapi.Pin{
+				Cid: newOutcome(d, o),
+			},
+		},
 		Key: k,
-		Cid: newOutcome(d, o),
 	}
 }
 

pinning/service.go

@@ -220,36 +220,13 @@ func (s *Service) ReplacePin(
 		return nil, fmt.Errorf("decoding pin cid: %v", err)
 	}
 
-	// Ensure bucket is readable
-	//if _, err := s.GetPin(ctx, thread, key, id, identity); err != nil {
-	//	return nil, err
-	//}
-
 	status := openapi.PinStatus{
 		Requestid: id,
 		Status:    openapi.QUEUED,
 		Created:   time.Now(),
 		Pin:       pin,
 	}
 
-	// Push a new placeholder to the bucket. This will block if the request is pinning.
-	//if _, err := s.lib.PushPath(
-	//	ctx,
-	//	thread,
-	//	key,
-	//	identity,
-	//	nil,
-	//	buckets.PushPathsInput{
-	//		Path:   status.Requestid,
-	//		Reader: strings.NewReader(fmt.Sprintf("pin %s in progress", pin.Cid)),
-	//		Meta: map[string]interface{}{
-	//			"pin": status,
-	//		},
-	//	},
-	//); err != nil {
-	//	return nil, fmt.Errorf("pushing new status to bucket: %v", err)
-	//}
-
 	// Remove from queues.
 	if err := s.queue.RemoveRequest(key, id); err != nil {
 		return nil, fmt.Errorf("removing request: %v", err)