Fix testhelper.deepDiffEqual (#374)
* Fix deepdiff comparison with maps
* Fix RemainingKeys function
* Fix unit tests
* Another fix of RemainingKeys
* RemainingKeys cleanup
* Simplifying RemainingKeys
* Revert continue on invalid. Fix broken tests
Related-PROD: PROD-28126
Change-Id: Ifc5afaf1278c7cff3a89b23a1fd1876aac1dff34
diff --git a/openstack/cdn/v1/base/testing/requests_test.go b/openstack/cdn/v1/base/testing/requests_test.go
index 69a8256..216a271 100644
--- a/openstack/cdn/v1/base/testing/requests_test.go
+++ b/openstack/cdn/v1/base/testing/requests_test.go
@@ -17,16 +17,18 @@
th.CheckNoErr(t, err)
expected := base.HomeDocument{
- "rel/cdn": map[string]interface{}{
- "href-template": "services{?marker,limit}",
- "href-vars": map[string]interface{}{
- "marker": "param/marker",
- "limit": "param/limit",
- },
- "hints": map[string]interface{}{
- "allow": []string{"GET"},
- "formats": map[string]interface{}{
- "application/json": map[string]interface{}{},
+ "resources": map[string]interface{}{
+ "rel/cdn": map[string]interface{}{
+ "href-template": "services{?marker,limit}",
+ "href-vars": map[string]interface{}{
+ "marker": "param/marker",
+ "limit": "param/limit",
+ },
+ "hints": map[string]interface{}{
+ "allow": []interface{}{"GET"},
+ "formats": map[string]interface{}{
+ "application/json": map[string]interface{}{},
+ },
},
},
},
diff --git a/openstack/compute/v2/servers/testing/fixtures.go b/openstack/compute/v2/servers/testing/fixtures.go
index 939a530..ba91bcf 100644
--- a/openstack/compute/v2/servers/testing/fixtures.go
+++ b/openstack/compute/v2/servers/testing/fixtures.go
@@ -870,17 +870,17 @@
"public": []servers.Address{
{
Version: 4,
- Address: "80.56.136.39",
+ Address: "50.56.176.35",
},
{
Version: 6,
- Address: "2001:4800:790e:510:be76:4eff:fe04:82a8",
+ Address: "2001:4800:790e:510:be76:4eff:fe04:84a8",
},
},
"private": []servers.Address{
{
Version: 4,
- Address: "10.880.3.154",
+ Address: "10.180.3.155",
},
},
}
@@ -901,7 +901,7 @@
},
{
"version": 6,
- "addr": "2001:4800:780e:510:be76:4eff:fe04:84a8"
+ "addr": "2001:4800:790e:510:be76:4eff:fe04:84a8"
}
],
"private": [
@@ -923,7 +923,7 @@
},
{
Version: 6,
- Address: "2001:4800:780e:510:be76:4eff:fe04:84a8",
+ Address: "2001:4800:790e:510:be76:4eff:fe04:84a8",
},
}
@@ -942,7 +942,7 @@
},
{
"version": 6,
- "addr": "2001:4800:780e:510:be76:4eff:fe04:84a8"
+ "addr": "2001:4800:790e:510:be76:4eff:fe04:84a8"
}
]
}`)
diff --git a/openstack/db/v1/configurations/testing/fixtures.go b/openstack/db/v1/configurations/testing/fixtures.go
index 63d028a..e36d610 100644
--- a/openstack/db/v1/configurations/testing/fixtures.go
+++ b/openstack/db/v1/configurations/testing/fixtures.go
@@ -154,6 +154,6 @@
Updated: timeVal,
Values: map[string]interface{}{
"collation_server": "latin1_swedish_ci",
- "connect_timeout": 120,
+ "connect_timeout": float64(120),
},
}
diff --git a/openstack/sharedfilesystems/v2/sharetypes/testing/requests_test.go b/openstack/sharedfilesystems/v2/sharetypes/testing/requests_test.go
index 584e7fb..36fa4bd 100644
--- a/openstack/sharedfilesystems/v2/sharetypes/testing/requests_test.go
+++ b/openstack/sharedfilesystems/v2/sharetypes/testing/requests_test.go
@@ -94,7 +94,7 @@
Name: "d",
IsPublic: true,
ExtraSpecs: map[string]interface{}{"driver_handles_share_servers": "false", "snapshot_support": "True"},
- RequiredExtraSpecs: map[string]interface{}{"driver_handles_share_servers": "True"},
+ RequiredExtraSpecs: map[string]interface{}{"driver_handles_share_servers": "false"},
},
}