mirror of
				https://github.com/containers/podman.git
				synced 2025-10-31 18:08:51 +08:00 
			
		
		
		
	Bump github.com/stretchr/testify from 1.3.0 to 1.4.0
Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.3.0 to 1.4.0. - [Release notes](https://github.com/stretchr/testify/releases) - [Commits](https://github.com/stretchr/testify/compare/v1.3.0...v1.4.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
This commit is contained in:
		![27856297+dependabot-preview[bot]@users.noreply.github.com](/assets/img/avatar_default.png) dependabot-preview[bot]
					dependabot-preview[bot]
				
			
				
					committed by
					
						 Valentin Rothberg
						Valentin Rothberg
					
				
			
			
				
	
			
			
			 Valentin Rothberg
						Valentin Rothberg
					
				
			
						parent
						
							01b7af8ee9
						
					
				
				
					commit
					240f4cd639
				
			
							
								
								
									
										96
									
								
								vendor/github.com/stretchr/testify/assert/assertions.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										96
									
								
								vendor/github.com/stretchr/testify/assert/assertions.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @ -18,6 +18,7 @@ import ( | ||||
|  | ||||
| 	"github.com/davecgh/go-spew/spew" | ||||
| 	"github.com/pmezard/go-difflib/difflib" | ||||
| 	yaml "gopkg.in/yaml.v2" | ||||
| ) | ||||
|  | ||||
| //go:generate go run ../_codegen/main.go -output-package=assert -template=assertion_format.go.tmpl | ||||
| @ -350,6 +351,37 @@ func Equal(t TestingT, expected, actual interface{}, msgAndArgs ...interface{}) | ||||
|  | ||||
| } | ||||
|  | ||||
| // Same asserts that two pointers reference the same object. | ||||
| // | ||||
| //    assert.Same(t, ptr1, ptr2) | ||||
| // | ||||
| // Both arguments must be pointer variables. Pointer variable sameness is | ||||
| // determined based on the equality of both type and value. | ||||
| func Same(t TestingT, expected, actual interface{}, msgAndArgs ...interface{}) bool { | ||||
| 	if h, ok := t.(tHelper); ok { | ||||
| 		h.Helper() | ||||
| 	} | ||||
|  | ||||
| 	expectedPtr, actualPtr := reflect.ValueOf(expected), reflect.ValueOf(actual) | ||||
| 	if expectedPtr.Kind() != reflect.Ptr || actualPtr.Kind() != reflect.Ptr { | ||||
| 		return Fail(t, "Invalid operation: both arguments must be pointers", msgAndArgs...) | ||||
| 	} | ||||
|  | ||||
| 	expectedType, actualType := reflect.TypeOf(expected), reflect.TypeOf(actual) | ||||
| 	if expectedType != actualType { | ||||
| 		return Fail(t, fmt.Sprintf("Pointer expected to be of type %v, but was %v", | ||||
| 			expectedType, actualType), msgAndArgs...) | ||||
| 	} | ||||
|  | ||||
| 	if expected != actual { | ||||
| 		return Fail(t, fmt.Sprintf("Not same: \n"+ | ||||
| 			"expected: %p %#v\n"+ | ||||
| 			"actual  : %p %#v", expected, expected, actual, actual), msgAndArgs...) | ||||
| 	} | ||||
|  | ||||
| 	return true | ||||
| } | ||||
|  | ||||
| // formatUnequalValues takes two values of arbitrary types and returns string | ||||
| // representations appropriate to be presented to the user. | ||||
| // | ||||
| @ -479,14 +511,14 @@ func isEmpty(object interface{}) bool { | ||||
| 	// collection types are empty when they have no element | ||||
| 	case reflect.Array, reflect.Chan, reflect.Map, reflect.Slice: | ||||
| 		return objValue.Len() == 0 | ||||
| 	// pointers are empty if nil or if the value they point to is empty | ||||
| 		// pointers are empty if nil or if the value they point to is empty | ||||
| 	case reflect.Ptr: | ||||
| 		if objValue.IsNil() { | ||||
| 			return true | ||||
| 		} | ||||
| 		deref := objValue.Elem().Interface() | ||||
| 		return isEmpty(deref) | ||||
| 	// for all other types, compare against the zero value | ||||
| 		// for all other types, compare against the zero value | ||||
| 	default: | ||||
| 		zero := reflect.Zero(objValue.Type()) | ||||
| 		return reflect.DeepEqual(object, zero.Interface()) | ||||
| @ -629,7 +661,7 @@ func NotEqual(t TestingT, expected, actual interface{}, msgAndArgs ...interface{ | ||||
| func includeElement(list interface{}, element interface{}) (ok, found bool) { | ||||
|  | ||||
| 	listValue := reflect.ValueOf(list) | ||||
| 	elementValue := reflect.ValueOf(element) | ||||
| 	listKind := reflect.TypeOf(list).Kind() | ||||
| 	defer func() { | ||||
| 		if e := recover(); e != nil { | ||||
| 			ok = false | ||||
| @ -637,11 +669,12 @@ func includeElement(list interface{}, element interface{}) (ok, found bool) { | ||||
| 		} | ||||
| 	}() | ||||
|  | ||||
| 	if reflect.TypeOf(list).Kind() == reflect.String { | ||||
| 	if listKind == reflect.String { | ||||
| 		elementValue := reflect.ValueOf(element) | ||||
| 		return true, strings.Contains(listValue.String(), elementValue.String()) | ||||
| 	} | ||||
|  | ||||
| 	if reflect.TypeOf(list).Kind() == reflect.Map { | ||||
| 	if listKind == reflect.Map { | ||||
| 		mapKeys := listValue.MapKeys() | ||||
| 		for i := 0; i < len(mapKeys); i++ { | ||||
| 			if ObjectsAreEqual(mapKeys[i].Interface(), element) { | ||||
| @ -1337,6 +1370,24 @@ func JSONEq(t TestingT, expected string, actual string, msgAndArgs ...interface{ | ||||
| 	return Equal(t, expectedJSONAsInterface, actualJSONAsInterface, msgAndArgs...) | ||||
| } | ||||
|  | ||||
| // YAMLEq asserts that two YAML strings are equivalent. | ||||
| func YAMLEq(t TestingT, expected string, actual string, msgAndArgs ...interface{}) bool { | ||||
| 	if h, ok := t.(tHelper); ok { | ||||
| 		h.Helper() | ||||
| 	} | ||||
| 	var expectedYAMLAsInterface, actualYAMLAsInterface interface{} | ||||
|  | ||||
| 	if err := yaml.Unmarshal([]byte(expected), &expectedYAMLAsInterface); err != nil { | ||||
| 		return Fail(t, fmt.Sprintf("Expected value ('%s') is not valid yaml.\nYAML parsing error: '%s'", expected, err.Error()), msgAndArgs...) | ||||
| 	} | ||||
|  | ||||
| 	if err := yaml.Unmarshal([]byte(actual), &actualYAMLAsInterface); err != nil { | ||||
| 		return Fail(t, fmt.Sprintf("Input ('%s') needs to be valid yaml.\nYAML error: '%s'", actual, err.Error()), msgAndArgs...) | ||||
| 	} | ||||
|  | ||||
| 	return Equal(t, expectedYAMLAsInterface, actualYAMLAsInterface, msgAndArgs...) | ||||
| } | ||||
|  | ||||
| func typeAndKind(v interface{}) (reflect.Type, reflect.Kind) { | ||||
| 	t := reflect.TypeOf(v) | ||||
| 	k := t.Kind() | ||||
| @ -1371,8 +1422,8 @@ func diff(expected interface{}, actual interface{}) string { | ||||
| 		e = spewConfig.Sdump(expected) | ||||
| 		a = spewConfig.Sdump(actual) | ||||
| 	} else { | ||||
| 		e = expected.(string) | ||||
| 		a = actual.(string) | ||||
| 		e = reflect.ValueOf(expected).String() | ||||
| 		a = reflect.ValueOf(actual).String() | ||||
| 	} | ||||
|  | ||||
| 	diff, _ := difflib.GetUnifiedDiffString(difflib.UnifiedDiff{ | ||||
| @ -1414,3 +1465,34 @@ var spewConfig = spew.ConfigState{ | ||||
| type tHelper interface { | ||||
| 	Helper() | ||||
| } | ||||
|  | ||||
| // Eventually asserts that given condition will be met in waitFor time, | ||||
| // periodically checking target function each tick. | ||||
| // | ||||
| //    assert.Eventually(t, func() bool { return true; }, time.Second, 10*time.Millisecond) | ||||
| func Eventually(t TestingT, condition func() bool, waitFor time.Duration, tick time.Duration, msgAndArgs ...interface{}) bool { | ||||
| 	if h, ok := t.(tHelper); ok { | ||||
| 		h.Helper() | ||||
| 	} | ||||
|  | ||||
| 	timer := time.NewTimer(waitFor) | ||||
| 	ticker := time.NewTicker(tick) | ||||
| 	checkPassed := make(chan bool) | ||||
| 	defer timer.Stop() | ||||
| 	defer ticker.Stop() | ||||
| 	defer close(checkPassed) | ||||
| 	for { | ||||
| 		select { | ||||
| 		case <-timer.C: | ||||
| 			return Fail(t, "Condition never satisfied", msgAndArgs...) | ||||
| 		case result := <-checkPassed: | ||||
| 			if result { | ||||
| 				return true | ||||
| 			} | ||||
| 		case <-ticker.C: | ||||
| 			go func() { | ||||
| 				checkPassed <- condition() | ||||
| 			}() | ||||
| 		} | ||||
| 	} | ||||
| } | ||||
|  | ||||
		Reference in New Issue
	
	Block a user