e2e: keep the test strong

Signed-off-by: Yan Song <imeoer@linux.alibaba.com>
dragonflyoss · Apr 27, 2023 · 1589db2 · 1589db2
1 parent ba2f115
commit 1589db2
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 22 deletions.
diff --git a/contrib/nydusify/tests/e2e_test.go b/contrib/nydusify/tests/e2e_test.go
@@ -10,7 +10,7 @@ import (
 	"testing"
 
 	"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/utils"
-	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func testBasicConvert(t *testing.T, fsVersion string) {
@@ -50,7 +50,7 @@ func testReproducableBuild(t *testing.T, fsVersion string) {
 		if len(initBootstraHash) == 0 {
 			initBootstraHash = hash
 		} else {
-			assert.Equal(t, initBootstraHash, hash)
+			require.Equal(t, initBootstraHash, hash)
 		}
 	}
 }

diff --git a/contrib/nydusify/tests/nydusify.go b/contrib/nydusify/tests/nydusify.go
@@ -12,12 +12,12 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
-
 	"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/checker"
 	"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/converter"
 	"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/converter/provider"
 	"github.com/dragonflyoss/image-service/contrib/nydusify/pkg/remote"
+
+	"github.com/stretchr/testify/require"
 )
 
 var nydusImagePath string
@@ -96,19 +96,19 @@ func (nydusify *Nydusify) Convert(t *testing.T) {
 	}
 
 	logger, err := provider.DefaultLogger()
-	assert.Nil(t, err)
+	require.Nil(t, err)
 
 	sourceRemote, err := provider.DefaultRemote(host+"/"+nydusify.Source, true)
-	assert.Nil(t, err)
+	require.Nil(t, err)
 
 	targetRemote, err := provider.DefaultRemote(host+"/"+nydusify.Target, true)
-	assert.Nil(t, err)
+	require.Nil(t, err)
 
 	var cacheRemote *remote.Remote
 	if buildCache != "" {
 		buildCache = host + "/" + nydusify.Cache
 		cacheRemote, err = provider.DefaultRemote(buildCache, true)
-		assert.Nil(t, err)
+		require.Nil(t, err)
 	}
 
 	opt := converter.Opt{
@@ -140,10 +140,10 @@ func (nydusify *Nydusify) Convert(t *testing.T) {
 	}
 
 	cvt, err := converter.New(opt)
-	assert.Nil(t, err)
+	require.Nil(t, err)
 
 	err = cvt.Convert(context.Background())
-	assert.Nil(t, err)
+	require.Nil(t, err)
 }
 
 func (nydusify *Nydusify) Check(t *testing.T) {
@@ -158,8 +158,8 @@ func (nydusify *Nydusify) Check(t *testing.T) {
 		NydusdPath:     nydusdPath,
 		ExpectedArch:   "amd64",
 	})
-	assert.Nil(t, err)
+	require.Nil(t, err)
 
 	err = checker.Check(context.Background())
-	assert.Nil(t, err)
+	require.Nil(t, err)
 }
diff --git a/contrib/nydusify/tests/registry.go b/contrib/nydusify/tests/registry.go
@@ -15,7 +15,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 var registryPort = 5051
@@ -26,15 +26,15 @@ func run(t *testing.T, cmd string, ignoreStatus bool) {
 	_cmd.Stderr = os.Stderr
 	err := _cmd.Run()
 	if !ignoreStatus {
-		assert.Nil(t, err)
+		require.Nil(t, err)
 	}
 }
 
 func runWithOutput(t *testing.T, cmd string) string {
 	_cmd := exec.Command("sh", "-c", cmd)
 	_cmd.Stderr = os.Stderr
 	output, err := _cmd.Output()
-	assert.Nil(t, err)
+	require.Nil(t, err)
 	return string(output)
 }
 
@@ -47,21 +47,21 @@ type Registry struct {
 
 func NewAuthRegistry(t *testing.T) *Registry {
 	err := os.Mkdir("auth", 0755)
-	assert.Nil(t, err)
+	require.Nil(t, err)
 	authString := runWithOutput(t, "docker run --rm --entrypoint htpasswd httpd:2 -Bbn testuser testpassword")
 	authFile, _ := filepath.Abs(filepath.Join("auth", "htpasswd"))
 	err = ioutil.WriteFile(authFile, []byte(authString), 0644)
-	assert.Nil(t, err)
+	require.Nil(t, err)
 
 	err = os.Mkdir(".docker", 0755)
-	assert.Nil(t, err)
+	require.Nil(t, err)
 	configString := fmt.Sprintf(`{"auths": { "localhost:%d": { "auth": "%s" }}}`,
 		registryPort, base64.StdEncoding.EncodeToString([]byte("testuser:testpassword")))
 	configFile, _ := filepath.Abs(filepath.Join(".docker", "config.json"))
 	err = os.Setenv("DOCKER_CONFIG", path.Dir(configFile))
-	assert.Nil(t, err)
+	require.Nil(t, err)
 	err = ioutil.WriteFile(configFile, []byte(configString), 0644)
-	assert.Nil(t, err)
+	require.Nil(t, err)
 
 	containerID := runWithOutput(t, fmt.Sprintf("docker run -p %d:5000 --rm -d  -v %s:/auth "+
 		`-e "REGISTRY_AUTH=htpasswd" -e "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm" `+

diff --git a/misc/nydusify-smoke/entrypoint.sh b/misc/nydusify-smoke/entrypoint.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
 
-set -e
+set -xe
 
 TEST_NAME=$1
 
-dockerd-entrypoint.sh & sleep 5
+dockerd-entrypoint.sh & sleep 30
 mkdir /lib64 && ln -s /lib/libc.musl-x86_64.so.1 /lib64/ld-linux-x86-64.so.2
 ../nydusify-smoke -test.run $TEST_NAME