fix: apply test recommendations

Signed-off-by: Terry Howe <[email protected]>
oras-project · Dec 3, 2024 · b7a2ecb · b7a2ecb
1 parent 7692fbc
commit b7a2ecb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/cmd/oras/internal/display/handler_test.go b/cmd/oras/internal/display/handler_test.go
@@ -18,6 +18,7 @@ package display
 import (
 	"oras.land/oras/internal/testutils"
 	"os"
+	"reflect"
 	"testing"
 
 	"oras.land/oras/cmd/oras/internal/display/metadata/text"
@@ -28,7 +29,7 @@ import (
 
 func TestNewPushHandler(t *testing.T) {
 	mockFetcher := testutils.NewMockFetcher()
-	printer := output.NewPrinter(os.Stdout, os.Stderr, false)
+	printer := output.NewPrinter(os.Stdout, os.Stderr)
 	_, _, err := NewPushHandler(printer, option.Format{Type: option.FormatTypeText.Name}, os.Stdout, mockFetcher.Fetcher)
 	if err != nil {
 		t.Errorf("NewPushHandler() error = %v, want nil", err)
@@ -37,23 +38,23 @@ func TestNewPushHandler(t *testing.T) {
 
 func TestNewAttachHandler(t *testing.T) {
 	mockFetcher := testutils.NewMockFetcher()
-	printer := output.NewPrinter(os.Stdout, os.Stderr, false)
+	printer := output.NewPrinter(os.Stdout, os.Stderr)
 	_, _, err := NewAttachHandler(printer, option.Format{Type: option.FormatTypeText.Name}, os.Stdout, mockFetcher.Fetcher)
 	if err != nil {
 		t.Errorf("NewAttachHandler() error = %v, want nil", err)
 	}
 }
 
 func TestNewPullHandler(t *testing.T) {
-	printer := output.NewPrinter(os.Stdout, os.Stderr, false)
+	printer := output.NewPrinter(os.Stdout, os.Stderr)
 	_, _, err := NewPullHandler(printer, option.Format{Type: option.FormatTypeText.Name}, "", os.Stdout)
 	if err != nil {
 		t.Errorf("NewPullHandler() error = %v, want nil", err)
 	}
 }
 
 func TestNewCopyHandler(t *testing.T) {
-	printer := output.NewPrinter(os.Stdout, os.Stderr, false)
+	printer := output.NewPrinter(os.Stdout, os.Stderr)
 	copyHandler, copyMetadataHandler := NewCopyHandler(printer, os.Stdout, nil)
 	if _, ok := copyHandler.(*status.TTYCopyHandler); !ok {
 		t.Errorf("expected *status.TTYCopyHandler actual %v", reflect.TypeOf(copyHandler))

diff --git a/cmd/oras/internal/display/status/tty_console_test.go b/cmd/oras/internal/display/status/tty_console_test.go
@@ -18,10 +18,12 @@ limitations under the License.
 package status
 
 import (
+	"strconv"
+	"testing"
+
 	"oras.land/oras-go/v2"
 	"oras.land/oras-go/v2/content/memory"
 	"oras.land/oras/internal/testutils"
-	"testing"
 )
 
 type testGraphTarget struct {
@@ -117,13 +119,13 @@ func TestTTYCopyHandler_OnCopySkipped(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	defer ch.StopTracking()
 
 	if err = ch.OnCopySkipped(ctx, mockFetcher.OciImage); err != nil {
 		t.Errorf("OnCopySkipped() should not return an error: %v", err)
 	}
 
-	if err = testutils.MatchPty(pty, slave, "\x1b[?25l\x1b7\x1b[0m"); err != nil {
+	ch.StopTracking()
+	if err = testutils.MatchPty(pty, slave, "Skipped", mockFetcher.OciImage.MediaType, strconv.FormatInt(mockFetcher.OciImage.Size, 10), "100%"); err != nil {
 		t.Fatal(err)
 	}
 }